diff options
3 files changed, 2 insertions, 42 deletions
diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java index f50502e0a331..de61d70a9260 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/core/java/android/content/pm/PackageManagerInternal.java @@ -778,14 +778,6 @@ public abstract class PackageManagerInternal { public abstract void writePermissionSettings(@NonNull @UserIdInt int[] userIds, boolean async); /** - * Returns the target SDK for the given UID. Will return {@code 0} if there is no - * package associated with the UID or if the package has not been installed for - * the user. Will return the highest target SDK if the UID references packages with - * a shared user id. - */ - public abstract int getTargetSdk(int uid); - - /** * Returns {@code true} if the caller is the installer of record for the given package. * Otherwise, {@code false}. */ diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 47b300fd9fc5..2bf5f4d87682 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -23740,38 +23740,6 @@ public class PackageManagerService extends IPackageManager.Stub } @Override - public int getTargetSdk(int uid) { - int userId = UserHandle.getUserId(uid); - - synchronized (mLock) { - final Object obj = mSettings.getSettingLPr(UserHandle.getAppId(uid)); - if (obj instanceof PackageSetting) { - final PackageSetting ps = (PackageSetting) obj; - if (!ps.getInstalled(userId)) { - return 0; - } - return ps.pkg.applicationInfo.targetSdkVersion; - } else if (obj instanceof SharedUserSetting) { - int maxTargetSdk = 0; - final SharedUserSetting sus = (SharedUserSetting) obj; - final int numPkgs = sus.packages.size(); - for (int i = 0; i < numPkgs; i++) { - final PackageSetting ps = sus.packages.valueAt(i); - if (!ps.getInstalled(userId)) { - continue; - } - if (ps.pkg.applicationInfo.targetSdkVersion < maxTargetSdk) { - continue; - } - maxTargetSdk = ps.pkg.applicationInfo.targetSdkVersion; - } - return maxTargetSdk; - } - return 0; - } - } - - @Override public boolean isCallerInstallerOfRecord( @NonNull PackageParser.Package pkg, int callingUid) { synchronized (mLock) { diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index fda798caf433..5a410d7d820f 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -627,7 +627,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, "Need " + Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY + " to change policy flags"); - } else if (mPackageManagerInt.getTargetSdk(callingUid) + } else if (mPackageManagerInt.getUidTargetSdkVersion(callingUid) >= Build.VERSION_CODES.Q) { throw new IllegalArgumentException( Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY + " needs " @@ -1583,7 +1583,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { // If permission review is enabled and this is a legacy app, mark the // permission as requiring a review as this is the initial state. final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId); - final int targetSdk = mPackageManagerInt.getTargetSdk(uid); + final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid); final int flags = (targetSdk < Build.VERSION_CODES.M && bp.isRuntime()) ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKE_ON_UPGRADE : 0; |