Merge "Fetch correct sandboxsdk packageUid for a user" into tm-qpr-dev am: e738f84a74 am: 764dab7daf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967044 Change-Id: Ie0e0c1ec95f057fdccd1438a1c58acfb927f1173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -4373,9 +4373,8 @@ public class AppOpsService extends IAppOpsService.Stub implements PersistenceSch
|
||||
final PackageManager pm = mContext.getPackageManager();
|
||||
final String supplementalPackageName = pm.getSdkSandboxPackageName();
|
||||
if (Objects.equals(packageName, supplementalPackageName)) {
|
||||
int supplementalAppId = pm.getPackageUid(supplementalPackageName,
|
||||
PackageManager.PackageInfoFlags.of(0));
|
||||
uid = UserHandle.getUid(UserHandle.getUserId(uid), supplementalAppId);
|
||||
uid = pm.getPackageUidAsUser(supplementalPackageName,
|
||||
PackageManager.PackageInfoFlags.of(0), UserHandle.getUserId(uid));
|
||||
}
|
||||
} catch (PackageManager.NameNotFoundException e) {
|
||||
// Shouldn't happen for the supplemental package
|
||||
|
||||
Reference in New Issue
Block a user