Fix issue #3377999: Activities need to be stopped when sleeping
This is a band-aid over the existing kludgy stopping mechanism
where the semantics of stop are different in the activity manager
than in the clients.
This change is intended to be as unobtrusive as possible, only
impacting the sleep case. I have a different change that
completely reworks how we stop activities to simply this all
a lot by unifying the semantics between the server and client.
However, it is too late in HC for such an extensive change. Later
I'll revert this one and put in the better solution.
Change-Id: Id77f2db1ec83469cdd888acb8fbc4679daa7766e
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 2389f01..e400a1f 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -421,6 +421,10 @@
token);
}
+ public final void scheduleSleeping(IBinder token, boolean sleeping) {
+ queueOrSendMessage(H.SLEEPING, token, sleeping ? 1 : 0);
+ }
+
public final void scheduleResumeActivity(IBinder token, boolean isForward) {
queueOrSendMessage(H.RESUME_ACTIVITY, token, isForward ? 1 : 0);
}
@@ -929,6 +933,7 @@
public static final int SCHEDULE_CRASH = 134;
public static final int DUMP_HEAP = 135;
public static final int DUMP_ACTIVITY = 136;
+ public static final int SLEEPING = 137;
String codeToString(int code) {
if (DEBUG_MESSAGES) {
switch (code) {
@@ -969,6 +974,7 @@
case SCHEDULE_CRASH: return "SCHEDULE_CRASH";
case DUMP_HEAP: return "DUMP_HEAP";
case DUMP_ACTIVITY: return "DUMP_ACTIVITY";
+ case SLEEPING: return "SLEEPING";
}
}
return "(unknown)";
@@ -1101,6 +1107,9 @@
case DUMP_ACTIVITY:
handleDumpActivity((DumpComponentInfo)msg.obj);
break;
+ case SLEEPING:
+ handleSleeping((IBinder)msg.obj, msg.arg1 != 0);
+ break;
}
if (DEBUG_MESSAGES) Slog.v(TAG, "<<< done: " + msg.what);
}
@@ -2615,6 +2624,42 @@
}
}
+ private final void handleSleeping(IBinder token, boolean sleeping) {
+ ActivityClientRecord r = mActivities.get(token);
+
+ if (r == null) {
+ Log.w(TAG, "handleWindowVisibility: no activity for token " + token);
+ return;
+ }
+
+ if (sleeping) {
+ if (!r.stopped) {
+ try {
+ // Now we are idle.
+ r.activity.performStop();
+ } catch (Exception e) {
+ if (!mInstrumentation.onException(r.activity, e)) {
+ throw new RuntimeException(
+ "Unable to stop activity "
+ + r.intent.getComponent().toShortString()
+ + ": " + e.toString(), e);
+ }
+ }
+ r.stopped = true;
+ }
+ // Tell activity manager we slept.
+ try {
+ ActivityManagerNative.getDefault().activitySlept(r.token);
+ } catch (RemoteException ex) {
+ }
+ } else {
+ if (r.stopped && r.activity.mVisibleFromServer) {
+ r.activity.performRestart();
+ r.stopped = false;
+ }
+ }
+ }
+
private final void deliverResults(ActivityClientRecord r, List<ResultInfo> results) {
final int N = results.size();
for (int i=0; i<N; i++) {