commit c02b2ec3f179820c31c470d89b919ce721513472
author Makoto Onuki <omakoto@google.com> Thu Aug 02 17:22:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 02 17:22:33 2018 +0000
tree add352d338eb14b42b45bed958d5c388faf224eb
parent 058b566f905c94214f135a94ce94abe112872f11
parent 075c81a3e21fdfc643d4f2010844eb833be0adc5

Merge "use correct userId when startProcess failed"

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 02d5d26..e91b26a 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4108,7 +4108,7 @@
             // the package was initially frozen through KILL_APPLICATION_MSG, so
             // it doesn't hurt to use it again.)
             forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false,
-                    false, true, false, false, UserHandle.getUserId(app.userId), "start failure");
+                    false, true, false, false, app.userId, "start failure");
         }
     }