diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2018-07-11 15:22:01 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-17 23:28:20 +0000 |
| commit | 5ece11b5dc4a045af0ecde33b23d9c310715640e (patch) | |
| tree | 1ae570d41fcbea5097fec88464e21e95fe65a9b3 | |
| parent | 6ee81130c012a97679f0e7c89329c43c017aa15c (diff) | |
| download | base-5ece11b5dc4a045af0ecde33b23d9c310715640e.tar.gz | |
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes: 111336376
Test: builds
(cherry picked from commit bc4d0326a04c19500f44283fbfab581257d3c75e)
| -rw-r--r-- | services/core/java/com/android/server/am/AppTaskImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/AppTaskImpl.java b/services/core/java/com/android/server/am/AppTaskImpl.java index 5f5a504bb014..bb6c6a0cbf7f 100644 --- a/services/core/java/com/android/server/am/AppTaskImpl.java +++ b/services/core/java/com/android/server/am/AppTaskImpl.java @@ -98,7 +98,7 @@ class AppTaskImpl extends IAppTask.Stub { final int callingUid = Binder.getCallingUid(); final long origId = Binder.clearCallingIdentity(); try { - synchronized (this) { + synchronized (mService) { mService.mStackSupervisor.startActivityFromRecents(callingPid, callingUid, mTaskId, null); } |