summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/am/ActivityManagerService.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-05-06 13:12:58 -0700
committerCraig Mautner <cmautner@google.com>2013-05-06 13:12:58 -0700
commitb59dcfd5e108fdffbc610ef109cccecbbd11cd75 (patch)
tree28903cc30e948129507d60fbaf652fc566f59510 /services/java/com/android/server/am/ActivityManagerService.java
parent05d290365f0b9ed781ffcb30b38a0c7c6e450e9d (diff)
Call ensureActivitiesVisibleLocked from supervisor.
- Don't call ActivityStack.ensureActivitiesVisibleLocked directly. Instead call ActivityStackSupervisor.ensureActivitiesVisibleLocked. - Add detecting monochrome screenshots to black screenshots. - minor refactors. Change-Id: I050b1cd40cacaab451f1460a77a82125a8077ff2
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 0e2b4a4d6a4a..c34b4ecadc7c 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4597,7 +4597,7 @@ public final class ActivityManagerService extends ActivityManagerNative
synchronized(this) {
ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) {
- stack.activityResumedLocked(token);
+ ActivityRecord.activityResumedLocked(token);
}
}
Binder.restoreCallingIdentity(origId);