Merge "Acquire service lock in AppTaskImpl.moveToFront()"

2018-07-12 03:30:20 +00:00
parent daf0e11ca5 9c189e1f78
commit 690c13b562
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/AppTaskImpl.java
+++ b/services/core/java/com/android/server/am/AppTaskImpl.java
@@ -97,7 +97,7 @@ class AppTaskImpl extends IAppTask.Stub {
        final int callingUid = Binder.getCallingUid();
        final long origId = Binder.clearCallingIdentity();
        try {
-            synchronized (this) {
+            synchronized (mService.mGlobalLock) {
                mService.mStackSupervisor.startActivityFromRecents(callingPid, callingUid, mTaskId,
                        null);
            }