Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e738f84a authored by Shiwangi Shah's avatar Shiwangi Shah Committed by Android (Google) Code Review
Browse files

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

parents 56cf35b2 83e92102

services/core/java/com/android/server/appop/AppOpsService.java

+2 −3
Original line number Diff line number Diff line
@@ -4593,9 +4593,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
                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