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

Commit 8979ddd3 authored by Nicholas Sauer's avatar Nicholas Sauer
Browse files

Convert uid to appid in getUidTargetSdkVersionLockedLPr. 

Callers of this method (as well as getUidTargetSdkVersion) are passing
in uid rather than app id.

Cleanup conversions of uid to appid in PackageManagerService to follow a
more consistent format.

bug: 122701636
Test: m
Change-Id: I4bbecb9dc4ebf4782c9ebcb7b5d05b1b23e38946
parent b0c7817f

services/core/java/com/android/server/pm/PackageManagerService.java

+20 −16
Original line number Diff line number Diff line
@@ -5487,13 +5487,13 @@ public class PackageManagerService extends IPackageManager.Stub 
        final int callingUserId = UserHandle.getUserId(callingUid);

        final boolean isCallerInstantApp = getInstantAppPackageName(callingUid) != null;

        // Map to base uids.

        uid1 = UserHandle.getAppId(uid1);

        uid2 = UserHandle.getAppId(uid2);

        final int appId1 = UserHandle.getAppId(uid1);

        final int appId2 = UserHandle.getAppId(uid2);

        // reader

        synchronized (mPackages) {

            Signature[] s1;

            Signature[] s2;

            Object obj = mSettings.getSettingLPr(uid1);

            Object obj = mSettings.getSettingLPr(appId1);

            if (obj != null) {

                if (obj instanceof SharedUserSetting) {

                    if (isCallerInstantApp) {
@@ -5512,7 +5512,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            } else {

                return PackageManager.SIGNATURE_UNKNOWN_PACKAGE;

            }

            obj = mSettings.getSettingLPr(uid2);

            obj = mSettings.getSettingLPr(appId2);

            if (obj != null) {

                if (obj instanceof SharedUserSetting) {

                    if (isCallerInstantApp) {
@@ -5567,11 +5567,11 @@ public class PackageManagerService extends IPackageManager.Stub 
        final int callingUid = Binder.getCallingUid();

        final int callingUserId = UserHandle.getUserId(callingUid);

        // Map to base uids.

        uid = UserHandle.getAppId(uid);

        final int appId = UserHandle.getAppId(uid);

        // reader

        synchronized (mPackages) {

            final PackageParser.SigningDetails signingDetails;

            final Object obj = mSettings.getSettingLPr(uid);

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj != null) {

                if (obj instanceof SharedUserSetting) {

                    final boolean isCallerInstantApp = getInstantAppPackageName(callingUid) != null;
@@ -5687,10 +5687,10 @@ public class PackageManagerService extends IPackageManager.Stub 
        final int callingUid = Binder.getCallingUid();

        final boolean isCallerInstantApp = getInstantAppPackageName(callingUid) != null;

        final int userId = UserHandle.getUserId(uid);

        uid = UserHandle.getAppId(uid);

        final int appId = UserHandle.getAppId(uid);

        // reader

        synchronized (mPackages) {

            Object obj = mSettings.getSettingLPr(uid);

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj instanceof SharedUserSetting) {

                if (isCallerInstantApp) {

                    return null;
@@ -5725,8 +5725,9 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (getInstantAppPackageName(callingUid) != null) {

            return null;

        }

        final int appId = UserHandle.getAppId(uid);

        synchronized (mPackages) {

            Object obj = mSettings.getSettingLPr(UserHandle.getAppId(uid));

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj instanceof SharedUserSetting) {

                final SharedUserSetting sus = (SharedUserSetting) obj;

                return sus.name + ":" + sus.userId;
@@ -5753,8 +5754,8 @@ public class PackageManagerService extends IPackageManager.Stub 
        final String[] names = new String[uids.length];

        synchronized (mPackages) {

            for (int i = uids.length - 1; i >= 0; i--) {

                final int uid = uids[i];

                Object obj = mSettings.getSettingLPr(UserHandle.getAppId(uid));

                final int appId = UserHandle.getAppId(uids[i]);

                final Object obj = mSettings.getSettingLPr(appId);

                if (obj instanceof SharedUserSetting) {

                    final SharedUserSetting sus = (SharedUserSetting) obj;

                    names[i] = "shared:" + sus.name;
@@ -5802,8 +5803,9 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (getInstantAppPackageName(callingUid) != null) {

            return 0;

        }

        final int appId = UserHandle.getAppId(uid);

        synchronized (mPackages) {

            Object obj = mSettings.getSettingLPr(UserHandle.getAppId(uid));

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj instanceof SharedUserSetting) {

                final SharedUserSetting sus = (SharedUserSetting) obj;

                return sus.pkgFlags;
@@ -5824,8 +5826,9 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (getInstantAppPackageName(callingUid) != null) {

            return 0;

        }

        final int appId = UserHandle.getAppId(uid);

        synchronized (mPackages) {

            Object obj = mSettings.getSettingLPr(UserHandle.getAppId(uid));

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj instanceof SharedUserSetting) {

                final SharedUserSetting sus = (SharedUserSetting) obj;

                return sus.pkgPrivateFlags;
@@ -5845,10 +5848,10 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (getInstantAppPackageName(Binder.getCallingUid()) != null) {

            return false;

        }

        uid = UserHandle.getAppId(uid);

        final int appId = UserHandle.getAppId(uid);

        // reader

        synchronized (mPackages) {

            Object obj = mSettings.getSettingLPr(uid);

            final Object obj = mSettings.getSettingLPr(appId);

            if (obj instanceof SharedUserSetting) {

                final SharedUserSetting sus = (SharedUserSetting) obj;

                final Iterator<PackageSetting> it = sus.packages.iterator();
@@ -18944,7 +18947,8 @@ public class PackageManagerService extends IPackageManager.Stub 














    @GuardedBy("mPackages")















    private int getUidTargetSdkVersionLockedLPr(int uid) {













        Object obj = mSettings.getSettingLPr(uid);













        final int appId = UserHandle.getAppId(uid);













        final Object obj = mSettings.getSettingLPr(appId);















        if (obj instanceof SharedUserSetting) {















            final SharedUserSetting sus = (SharedUserSetting) obj;















            int vers = Build.VERSION_CODES.CUR_DEVELOPMENT;