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

Commit 0facb713 authored by Shiwangi Shah's avatar Shiwangi Shah Committed by Automerger Merge Worker
Browse files

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

Merge "Fetch correct sandboxsdk packageUid for a user" into tm-qpr-dev am: e738f84a am: 764dab7d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967044



Change-Id: Ie0e0c1ec95f057fdccd1438a1c58acfb927f1173
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31e1a33f 764dab7d

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

+2 −3
Original line number Diff line number Diff line
@@ -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