commit 23f6ed6bd31e1f87e80cabe1c585a594ac5ee034
author Tony Mak <tonymak@google.com> Thu Apr 19 14:24:10 2018 +0100
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 20 00:04:31 2018 +0000
tree 040b5fd23481d409fdb5e7dd7f465c7d0a044be9
parent b738f2ad6f6495548664536d35b0f61e9f269994

getUserIdLPr should take application id as input

Fixes: 78265824
Test: Setup work profile using TestDPC -> add account into work profile.
Test: Add google.com in personal side to trigger work profile setup.

Change-Id: Ib87301fc98d0ebf1baa043e4badb5144a0f62377
(cherry picked from commit c59dfc61b66b31a2cf221a514599ee672604fdfa)

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 50ac4db..9fce12c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -23603,7 +23603,8 @@
 
         private SigningDetails getSigningDetails(int uid) {
             synchronized (mPackages) {
-                final Object obj = mSettings.getUserIdLPr(uid);
+                final int appId = UserHandle.getAppId(uid);
+                final Object obj = mSettings.getUserIdLPr(appId);
                 if (obj != null) {
                     if (obj instanceof SharedUserSetting) {
                         return ((SharedUserSetting) obj).signatures.mSigningDetails;