From 5184887879b847ac927ff37c65fd302dd2b16a3f Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 31 Jul 2018 11:33:21 -0700
Subject: Fix user-id for AMS.forceStopPackageLocked()

Test: visual inspection
Change-Id: I1cbc37fdda8530bee6f1cf1d4d7d16776b4ff55d
---
 services/core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index c64dfe0a4052..48d554cb2a74 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3575,7 +3575,7 @@ public class ActivityManagerService extends IActivityManager.Stub
             // 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");
             return false;
         }
     }
-- 
cgit v1.2.3-59-g8ed1b