Merge "Fetch correct sandboxsdk packageUid for a user" into tm-qpr-dev

This commit is contained in:
Shiwangi Shah
2022-09-20 15:02:39 +00:00
committed by Android (Google) Code Review

View File

@@ -4593,9 +4593,8 @@ public class AppOpsService extends IAppOpsService.Stub {
final PackageManager pm = mContext.getPackageManager(); final PackageManager pm = mContext.getPackageManager();
final String supplementalPackageName = pm.getSdkSandboxPackageName(); final String supplementalPackageName = pm.getSdkSandboxPackageName();
if (Objects.equals(packageName, supplementalPackageName)) { if (Objects.equals(packageName, supplementalPackageName)) {
int supplementalAppId = pm.getPackageUid(supplementalPackageName, uid = pm.getPackageUidAsUser(supplementalPackageName,
PackageManager.PackageInfoFlags.of(0)); PackageManager.PackageInfoFlags.of(0), UserHandle.getUserId(uid));
uid = UserHandle.getUid(UserHandle.getUserId(uid), supplementalAppId);
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Shouldn't happen for the supplemental package // Shouldn't happen for the supplemental package