Fix enforce calling package behavior in multi-user context.
Using PackageManager get from user context to make sure we get correct
uid to check when enforcing the calling package.
Bug: 186405064
Test: Manually complete the SuW
Change-Id: If0ed7fe29cf3e109649133f0b21f3db5ef6b9ca8
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 63def4e..6cff185 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3256,8 +3256,10 @@
*/
private void enforceCallingPackage(String callingPackage, int callingUid, String message) {
int packageUid = -1;
+ PackageManager pm = mApp.getBaseContext().createContextAsUser(
+ UserHandle.getUserHandleForUid(callingUid), 0).getPackageManager();
try {
- packageUid = mPm.getPackageUid(callingPackage, 0);
+ packageUid = pm.getPackageUid(callingPackage, 0);
} catch (PackageManager.NameNotFoundException e) {
// packageUid is -1
}