filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AOSP/Messaging - update the Messaging version to target P (28) or higher. Use JobIntentService to start the Backgroundworkerservice and ActionServiceImpl services.

Browse Source 
am: cdf40bb061

Change-Id: Id2cc2258a1cf787dad7238496d54cd6a2419b951
This commit is contained in:
Raman Tenneti
2019-02-20 03:08:29 -08:00
committed by android-build-merger
parent 2310d69876 cdf40bb061
commit b966c435c6
9 changed files with 100 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AndroidManifest.xml
View File

@@ -18,7 +18,7 @@
package="com.android.messaging"
android:installLocation="internalOnly">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<!-- Application holds CPU wakelock while working in background -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -327,8 +327,12 @@
<!-- Action Services -->
<service android:name=".datamodel.action.ActionServiceImpl"/>
<service android:name=".datamodel.action.BackgroundWorkerService"/>
<service android:name=".datamodel.action.ActionServiceImpl"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true"/>
<service android:name=".datamodel.action.BackgroundWorkerService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true"/>
<!-- Sms and Mms related items -->

7
TEST_MAPPING Normal file
View File

@@ -0,0 +1,7 @@
{
"presubmit": [
{
"name": "messagingtests"
}
]
}

103
src/com/android/messaging/datamodel/action/ActionServiceImpl.java
View File

@@ -17,7 +17,6 @@
package com.android.messaging.datamodel.action;
import android.app.AlarmManager;
import android.app.IntentService;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -25,22 +24,29 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import androidx.core.app.JobIntentService;
import com.android.messaging.Factory;
import com.android.messaging.datamodel.DataModel;
import com.android.messaging.util.ConnectivityUtil;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.LoggingTimer;
import com.android.messaging.util.WakeLockHelper;
import com.google.common.annotations.VisibleForTesting;
/**
* ActionService used to perform background processing for data model
*/
public class ActionServiceImpl extends IntentService {
public class ActionServiceImpl extends JobIntentService {
private static final String TAG = LogUtil.BUGLE_DATAMODEL_TAG;
private static final boolean VERBOSE = false;
/**
* Unique job ID for this service.
*/
public static final int JOB_ID = 1000;
public ActionServiceImpl() {
super("ActionService");
super();
}
/**
@@ -128,6 +134,7 @@ public class ActionServiceImpl extends IntentService {
protected static final String BUNDLE_ACTION = "bundle_action";
private BackgroundWorker mBackgroundWorker;
private ConnectivityUtil mConnectivityUtil;
/**
* Allocate an intent with a specific opcode.
@@ -206,90 +213,70 @@ public class ActionServiceImpl extends IntentService {
public void onCreate() {
super.onCreate();
mBackgroundWorker = DataModel.get().getBackgroundWorkerForActionService();
DataModel.get().getConnectivityUtil().registerForSignalStrength();
mConnectivityUtil = DataModel.get().getConnectivityUtil();
mConnectivityUtil.registerForSignalStrength();
}
@Override
public void onDestroy() {
super.onDestroy();
DataModel.get().getConnectivityUtil().unregisterForSignalStrength();
mConnectivityUtil.unregisterForSignalStrength();
}
private static final String WAKELOCK_ID = "bugle_datamodel_service_wakelock";
@VisibleForTesting
static WakeLockHelper sWakeLock = new WakeLockHelper(WAKELOCK_ID);
/**
* Queue intent to the ActionService after acquiring wake lock
* Queue intent to the ActionService.
*/
private static void startServiceWithIntent(final Intent intent) {
final Context context = Factory.get().getApplicationContext();
final int opcode = intent.getIntExtra(EXTRA_OP_CODE, 0);
// Increase refCount on wake lock - acquiring if necessary
if (VERBOSE) {
LogUtil.v(TAG, "acquiring wakelock for opcode " + opcode);
}
sWakeLock.acquire(context, intent, opcode);
intent.setClass(context, ActionServiceImpl.class);
enqueueWork(context, intent);
}
// TODO: Note that intent will be quietly discarded if it exceeds available rpc
// memory (in total around 1MB). See this article for background
// http://developer.android.com/reference/android/os/TransactionTooLargeException.html
// Perhaps we should keep large structures in the action monitor?
if (context.startService(intent) == null) {
LogUtil.e(TAG,
"ActionService.startServiceWithIntent: failed to start service for intent "
+ intent);
sWakeLock.release(intent, opcode);
}
public static void enqueueWork(Context context, Intent work) {
enqueueWork(context, ActionServiceImpl.class, JOB_ID, work);
}
/**
* {@inheritDoc}
*/
@Override
protected void onHandleIntent(final Intent intent) {
protected void onHandleWork(final Intent intent) {
if (intent == null) {
// Shouldn't happen but sometimes does following another crash.
LogUtil.w(TAG, "ActionService.onHandleIntent: Called with null intent");
return;
}
final int opcode = intent.getIntExtra(EXTRA_OP_CODE, 0);
sWakeLock.ensure(intent, opcode);
try {
Action action;
final Bundle actionBundle = intent.getBundleExtra(EXTRA_ACTION_BUNDLE);
actionBundle.setClassLoader(getClassLoader());
switch(opcode) {
case OP_START_ACTION: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
executeAction(action);
break;
}
case OP_RECEIVE_BACKGROUND_RESPONSE: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
final Bundle response = intent.getBundleExtra(EXTRA_WORKER_RESPONSE);
processBackgroundResponse(action, response);
break;
}
case OP_RECEIVE_BACKGROUND_FAILURE: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
processBackgroundFailure(action);
break;
}
default:
throw new RuntimeException("Unrecognized opcode in ActionServiceImpl");
Action action;
final Bundle actionBundle = intent.getBundleExtra(EXTRA_ACTION_BUNDLE);
actionBundle.setClassLoader(getClassLoader());
switch(opcode) {
case OP_START_ACTION: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
executeAction(action);
break;
}
action.sendBackgroundActions(mBackgroundWorker);
} finally {
// Decrease refCount on wake lock - releasing if necessary
sWakeLock.release(intent, opcode);
case OP_RECEIVE_BACKGROUND_RESPONSE: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
final Bundle response = intent.getBundleExtra(EXTRA_WORKER_RESPONSE);
processBackgroundResponse(action, response);
break;
}
case OP_RECEIVE_BACKGROUND_FAILURE: {
action = (Action) actionBundle.getParcelable(BUNDLE_ACTION);
processBackgroundFailure(action);
break;
}
default:
throw new RuntimeException("Unrecognized opcode in ActionServiceImpl");
}
action.sendBackgroundActions(mBackgroundWorker);
}
private static final long EXECUTION_TIME_WARN_LIMIT_MS = 1000; // 1 second

60
src/com/android/messaging/datamodel/action/BackgroundWorkerService.java
View File

@@ -16,18 +16,18 @@
package com.android.messaging.datamodel.action;
import android.app.IntentService;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.core.app.JobIntentService;
import com.android.messaging.Factory;
import com.android.messaging.datamodel.DataModel;
import com.android.messaging.datamodel.DataModelException;
import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.LoggingTimer;
import com.android.messaging.util.WakeLockHelper;
import com.google.common.annotations.VisibleForTesting;
import java.util.List;
@@ -37,18 +37,19 @@ import java.util.List;
* Used to actually "send" messages which may take some time and should not block ActionService
* or UI
*/
public class BackgroundWorkerService extends IntentService {
public class BackgroundWorkerService extends JobIntentService {
private static final String TAG = LogUtil.BUGLE_DATAMODEL_TAG;
private static final boolean VERBOSE = false;
private static final String WAKELOCK_ID = "bugle_background_worker_wakelock";
@VisibleForTesting
static WakeLockHelper sWakeLock = new WakeLockHelper(WAKELOCK_ID);
/**
* Unique job ID for this service.
*/
public static final int JOB_ID = 1001;
private final ActionService mHost;
public BackgroundWorkerService() {
super("BackgroundWorker");
super();
mHost = DataModel.get().getActionService();
}
@@ -74,7 +75,7 @@ public class BackgroundWorkerService extends IntentService {
protected static final String EXTRA_ATTEMPT = "retry_attempt";
/**
* Queue action intent to the BackgroundWorkerService after acquiring wake lock
* Queue action intent to the BackgroundWorkerService.
*/
private static void startServiceWithAction(final Action action,
final int retryCount) {
@@ -85,50 +86,41 @@ public class BackgroundWorkerService extends IntentService {
}
/**
* Queue intent to the BackgroundWorkerService after acquiring wake lock
* Queue intent to the BackgroundWorkerService.
*/
private static void startServiceWithIntent(final int opcode, final Intent intent) {
final Context context = Factory.get().getApplicationContext();
intent.setClass(context, BackgroundWorkerService.class);
intent.putExtra(EXTRA_OP_CODE, opcode);
sWakeLock.acquire(context, intent, opcode);
if (VERBOSE) {
LogUtil.v(TAG, "acquiring wakelock for opcode " + opcode);
}
if (context.startService(intent) == null) {
LogUtil.e(TAG,
"BackgroundWorkerService.startServiceWithAction: failed to start service for "
+ opcode);
sWakeLock.release(intent, opcode);
}
enqueueWork(context, intent);
}
public static void enqueueWork(Context context, Intent work) {
enqueueWork(context, BackgroundWorkerService.class, JOB_ID, work);
}
@Override
protected void onHandleIntent(final Intent intent) {
protected void onHandleWork(final Intent intent) {
if (intent == null) {
// Shouldn't happen but sometimes does following another crash.
LogUtil.w(TAG, "BackgroundWorkerService.onHandleIntent: Called with null intent");
return;
}
final int opcode = intent.getIntExtra(EXTRA_OP_CODE, 0);
sWakeLock.ensure(intent, opcode);
try {
switch(opcode) {
case OP_PROCESS_REQUEST: {
final Action action = intent.getParcelableExtra(EXTRA_ACTION);
final int attempt = intent.getIntExtra(EXTRA_ATTEMPT, -1);
doBackgroundWork(action, attempt);
break;
}
default:
throw new RuntimeException("Unrecognized opcode in BackgroundWorkerService");
switch(opcode) {
case OP_PROCESS_REQUEST: {
final Action action = intent.getParcelableExtra(EXTRA_ACTION);
final int attempt = intent.getIntExtra(EXTRA_ATTEMPT, -1);
doBackgroundWork(action, attempt);
break;
}
} finally {
sWakeLock.release(intent, opcode);
default:
LogUtil.w(TAG, "Unrecognized opcode in BackgroundWorkerService " + opcode);
throw new RuntimeException("Unrecognized opcode in BackgroundWorkerService");
}
}

2
tests/AndroidManifest.xml
View File

@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.messaging.test" >
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/>
<application android:label="Messaging Tests" >
<uses-library android:name="android.test.runner" />

4
tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java
View File

@@ -160,10 +160,6 @@ public class ActionServiceSystemTest extends BugleServiceTestCase<ActionServiceI
}
}
final ArrayList<Intent> intents = mContext.extractIntents();
assertNotNull(intents);
assertEquals("Expect to see one intent", intents.size(), 1);
assertEquals("Expect to see 1 server request queued", 1,
mWorker.getRequestsMade().size());
final Action request = mWorker.getRequestsMade().get(0);

35
tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java
View File

@@ -37,7 +37,6 @@ import com.android.messaging.datamodel.action.ActionTestHelpers.ResultTracker;
import com.android.messaging.datamodel.action.ActionTestHelpers.StubBackgroundWorker;
import com.android.messaging.datamodel.action.ActionTestHelpers.StubConnectivityUtil;
import com.android.messaging.datamodel.action.ActionTestHelpers.StubLoader;
import com.android.messaging.util.WakeLockHelper;
import java.util.ArrayList;
@@ -94,30 +93,19 @@ public class ActionServiceTest extends BugleServiceTestCase<ActionServiceImpl>
action.dontRelyOnMe = dontRelyOnMe;
assertFalse("Expect service initially stopped", mServiceStarted);
action.start(monitor);
assertTrue("Expect service started", mServiceStarted);
final ArrayList<Intent> intents = mContext.extractIntents();
assertNotNull(intents);
assertEquals("Expect to see 1 server request queued", 1, intents.size());
final Intent intent = intents.get(0);
assertEquals("Check pid", intent.getIntExtra(WakeLockHelper.EXTRA_CALLING_PID, 0),
Process.myPid());
assertEquals("Check opcode", intent.getIntExtra(ActionServiceImpl.EXTRA_OP_CODE, 0),
ActionServiceImpl.OP_START_ACTION);
assertTrue("Check wakelock held", ActionServiceImpl.sWakeLock.isHeld(intent));
synchronized(tracker) {
synchronized(mWorker) {
try {
this.startService(intent);
action.start(monitor);
// Wait for callback across threads
tracker.wait(2000);
mWorker.wait(2000);
mServiceStarted = true;
} catch (final InterruptedException e) {
assertTrue("Interrupted waiting for response processing", false);
assertTrue("Interrupted waiting for execution", false);
}
}
assertTrue("Expect service started", mServiceStarted);
assertEquals("Expect three states ", mStates.size(), 3);
assertEquals("State-0 should be STATE_QUEUED", (int)mStates.get(0),
ActionMonitor.STATE_QUEUED);
@@ -125,15 +113,6 @@ public class ActionServiceTest extends BugleServiceTestCase<ActionServiceImpl>
ActionMonitor.STATE_EXECUTING);
assertEquals("State-2 should be STATE_COMPLETE", (int)mStates.get(2),
ActionMonitor.STATE_COMPLETE);
// TODO: Should find a way to reliably wait, this is a bit of a hack
if (ActionServiceImpl.sWakeLock.isHeld(intent)) {
Log.d(TAG, "ActionServiceTest: waiting for wakelock release");
try {
Thread.sleep(100);
} catch (final InterruptedException e) {
}
}
assertFalse("Check wakelock released", ActionServiceImpl.sWakeLock.isHeld(intent));
}
StubBackgroundWorker mWorker;

9
tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java
View File

@@ -70,7 +70,8 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
// TestDataFactory creates NUM_TEST_CONVERSATIONS conversations. blank
// conversation would be the next conversation.
final String blankId = BugleDatabaseOperations.getExistingConversation(db, threadId, false);
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+1, Integer.parseInt((String)blankId));
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)blankId));
ArrayList<StubActionServiceCallLog> calls = mService.getCalls();
@@ -90,7 +91,8 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
assertTrue(result instanceof String);
// Make sure that we created a new conversation
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+1, Integer.parseInt((String)result));
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)result));
// Now get the conversation that we just created again
monitor = GetOrCreateConversationAction.getOrCreateConversation(participants, null,
@@ -108,7 +110,8 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
final String conversationId = (String) result;
// Make sure that we found the same conversation id
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+1, Integer.parseInt((String)result));
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)result));
final ArrayList<ParticipantData> conversationParticipants =
BugleDatabaseOperations.getParticipantsForConversation(db, conversationId);

1
tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java
View File

@@ -36,6 +36,7 @@ import com.android.messaging.datamodel.data.TestDataFactory;
import com.android.messaging.ui.CustomHeaderViewPagerAdapter;
import com.android.messaging.ui.FragmentTestCase;
import com.android.messaging.ui.UIIntents;
import com.android.messaging.ui.contact.ContactPickerFragment;
import com.android.messaging.ui.contact.ContactPickerFragment.ContactPickerFragmentHost;
import org.mockito.Matchers;