commit bc4d0326a04c19500f44283fbfab581257d3c75e
author Wale Ogunwale <ogunwale@google.com> Wed Jul 11 15:22:01 2018 -0700
committer Winson Chung <winsonc@google.com> Thu Jul 12 18:02:19 2018 +0000
tree e323cc96f8679d192e8b1c91d71eb4272abdbb88
parent 267b960dab63200b6ba4dc53dfc7e7ed064986fc

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

services/core/java/com/android/server/am/AppTaskImpl.java

diff --git a/services/core/java/com/android/server/am/AppTaskImpl.java b/services/core/java/com/android/server/am/AppTaskImpl.java
index 5f5a504..bb6c6a0 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 @@
         final int callingUid = Binder.getCallingUid();
         final long origId = Binder.clearCallingIdentity();
         try {
-            synchronized (this) {
+            synchronized (mService) {
                 mService.mStackSupervisor.startActivityFromRecents(callingPid, callingUid, mTaskId,
                         null);
             }