commit 7a622784ef93601fc50be3b65b6cd165d8dda4ad
author Makoto Onuki <omakoto@google.com> Wed May 10 16:32:39 2017 -0700
committer Makoto Onuki <omakoto@google.com> Wed May 10 16:57:24 2017 -0700
tree a055d326d58c33998c1d340b1fc5ac32ff0fc21e
parent 456882b5ae58e3e62a725663ccb2328d8b074526

Add a check to investigate b/37893215.

Test: Manual
Bug 37893215

Change-Id: I3a06af3828a5f51ecf4a539ef91b9a60575f68ba

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index dbe1cb6..60f3a06 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1357,6 +1357,15 @@
         if (mKeyguardController.isKeyguardLocked()) {
             r.notifyUnknownVisibilityLaunched();
         }
+        final int applicationInfoUid =
+                (r.info.applicationInfo != null) ? r.info.applicationInfo.uid : -1;
+        if ((r.userId != app.userId) || (r.appInfo.uid != applicationInfoUid)) {
+            Slog.wtf(TAG,
+                    "User ID for activity changing for " + r
+                            + " appInfo.uid=" + r.appInfo.uid
+                            + " info.ai.uid=" + applicationInfoUid
+                            + " old=" + r.app + " new=" + app);
+        }
 
         r.app = app;
         app.waitingToKill = null;