commit 591bf61f9d3d53c9529712e29748d7df81525cca
author Riddle Hsu <riddlehsu@google.com> Thu Feb 14 17:55:31 2019 +0800
committer Riddle Hsu <riddlehsu@google.com> Tue Feb 19 12:43:52 2019 +0800
tree 2e1c40aa0f0fe2f8a5318390787b951c03f6a443
parent 3e0c72484dff8b11b599cce09c4070cf71393215

Don't lock WM when calling ActivityStackSupervisor.resolveIntent()

In startActivities, now WM lock is only acquired on the execution of
activity starter. This fixes the deadlock from startActivitiesAsPackage
that locks WM then AM (in PackageManagerService.resolveIntentInternal).

Fixes: 123934974
Test: Manual - Long press an app icon to add a shortcut and launch it.
      (That invokes ILauncherApps.startShortcut -> startActivities)

Change-Id: Ief8d6eeeba40d33d2853df69b9a090abbf06b32f

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 258819f..449ae8c 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5923,14 +5923,12 @@
                 Binder.restoreCallingIdentity(ident);
             }
 
-            synchronized (mGlobalLock) {
-                return getActivityStartController().startActivitiesInPackage(
-                        packageUid, packageName,
-                        intents, resolvedTypes, null /* resultTo */,
-                        SafeActivityOptions.fromBundle(bOptions), userId,
-                        false /* validateIncomingUser */, null /* originatingPendingIntent */,
-                        false /* allowBackgroundActivityStart */);
-            }
+            return getActivityStartController().startActivitiesInPackage(
+                    packageUid, packageName,
+                    intents, resolvedTypes, null /* resultTo */,
+                    SafeActivityOptions.fromBundle(bOptions), userId,
+                    false /* validateIncomingUser */, null /* originatingPendingIntent */,
+                    false /* allowBackgroundActivityStart */);
         }
 
         @Override