Fix issue #36858643: Runtime restart on OPR1.170323.002
We had a layering problem between alarm manager, device idle
controller, and activity manager. The layering should be, from
bottom to top:
activity manager
alarm manager
device idle controller.
However in the path of activity manager's PendingIntent.send(),
it would do a direct call to device idle controller. It was
careful to do this without its lock held, but that isn't enough.
In this case, alarm manager is doing send() with its lock held,
expecting that to be safe, but it ends up causing it to call up
in to device idle controller via the activity manager (in order
to update the temporary whitelist).
To fix this, activity manager now has an internal data structure
representing pending temp whitelist requests, and all it does is
add to that during the call in, scheduling a message to later
dispatch those to device idle controller. But to make things
correct, we need to use this data stucture to act like the uid
is already on the temp whitelist even before we actually dispatch
that message. (So we don't have races with things calling
startService() for example.) So all the existing stuff looking
at the temp whitelist that is handed down by device idle controller
will also consult with this data structure of pending changes.
Test: bit CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: Id444b7ad3e694dc977c7f4fa236fbad855ce4066
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index baa71d7..349180f 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -155,8 +155,6 @@
static final int BROADCAST_INTENT_MSG = ActivityManagerService.FIRST_BROADCAST_QUEUE_MSG;
static final int BROADCAST_TIMEOUT_MSG = ActivityManagerService.FIRST_BROADCAST_QUEUE_MSG + 1;
- static final int SCHEDULE_TEMP_WHITELIST_MSG
- = ActivityManagerService.FIRST_BROADCAST_QUEUE_MSG + 2;
final BroadcastHandler mHandler;
@@ -178,13 +176,6 @@
broadcastTimeoutLocked(true);
}
} break;
- case SCHEDULE_TEMP_WHITELIST_MSG: {
- DeviceIdleController.LocalService dic = mService.mLocalDeviceIdleController;
- if (dic != null) {
- dic.addPowerSaveTempWhitelistAppDirect(UserHandle.getAppId(msg.arg1),
- msg.arg2, true, (String)msg.obj);
- }
- } break;
}
}
}
@@ -789,12 +780,11 @@
if (r.intent.getAction() != null) {
b.append(r.intent.getAction());
} else if (r.intent.getComponent() != null) {
- b.append(r.intent.getComponent().flattenToShortString());
+ r.intent.getComponent().appendShortString(b);
} else if (r.intent.getData() != null) {
b.append(r.intent.getData());
}
- mHandler.obtainMessage(SCHEDULE_TEMP_WHITELIST_MSG, uid, (int)duration, b.toString())
- .sendToTarget();
+ mService.tempWhitelistUidLocked(uid, duration, b.toString());
}
/**