Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc

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

Change-Id: I439bf33ed4be4f0bf2439f5565b57c9bdc398504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ganesh Olekar
2022-08-15 06:30:26 +00:00
parent b302dca798 84b1160cfc
commit 0a761a9510
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/PackageManagerInternal.java
View File

@@ -1011,4 +1011,10 @@ public abstract class PackageManagerInternal {
* that b/141413692 is not reproducible on Q.
*/
public abstract void userRemovedForTest();
/**
* Get installed SDK version of the package
* @param pkg package for which to retrieve the installed sdk version
*/
public abstract int getInstalledSdkVersion(PackageParser.Package pkg);
}

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -25246,6 +25246,11 @@ public class PackageManagerService extends IPackageManager.Stub
public void userRemovedForTest() {
mBlockDeleteOnUserRemoveForTest.open();
}
@Override
public int getInstalledSdkVersion(PackageParser.Package pkg) {
return PackageManagerService.this.getSettingsVersionForPackage(pkg).sdkVersion;
}
}
@GuardedBy("mPackages")

35
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -1096,23 +1096,26 @@ public class PermissionManagerService {
// or has updated its target SDK and AR is no longer implicit to it.
// This is a compatibility workaround for apps when AR permission was
// split in Q.
final List<PermissionManager.SplitPermissionInfo> permissionList =
getSplitPermissions();
int numSplitPerms = permissionList.size();
for (int splitPermNum = 0; splitPermNum < numSplitPerms; splitPermNum++) {
PermissionManager.SplitPermissionInfo sp =
permissionList.get(splitPermNum);
String splitPermName = sp.getSplitPermission();
if (sp.getNewPermissions().contains(permName)
&& origPermissions.hasInstallPermission(splitPermName)) {
upgradedActivityRecognitionPermission = splitPermName;
newImplicitPermissions.add(permName);
if (DEBUG_PERMISSIONS) {
Slog.i(TAG, permName + " is newly added for "
+ pkg.packageName);
// b/210065877: Check that the installed version is pre Q to auto-grant in
// case of OS update
if (mPackageManagerInt.getInstalledSdkVersion(pkg)
< Build.VERSION_CODES.Q) {
int numSplitPerms = PermissionManager.SPLIT_PERMISSIONS.size();
for (int splitPermNum = 0; splitPermNum < numSplitPerms;
splitPermNum++) {
PermissionManager.SplitPermissionInfo sp =
PermissionManager.SPLIT_PERMISSIONS.get(splitPermNum);
String splitPermName = sp.getSplitPermission();
if (sp.getNewPermissions().contains(permName)
&& origPermissions.hasInstallPermission(splitPermName)) {
upgradedActivityRecognitionPermission = splitPermName;
newImplicitPermissions.add(permName);
if (DEBUG_PERMISSIONS) {
Slog.i(TAG, permName + " is newly added for "
+ pkg.packageName);
}
break;
}
break;
}
}
}