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

DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q

Browse Source 
Test: Manually install app apks targeting Q and verifying that AR permission is not auto-granted
Test: atest ActivityRecognitionPermissionTest
Bug: 210065877
Change-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8
(cherry picked from commit 84b1160cfc)
This commit is contained in:
Ganesh Olekar
2022-05-11 22:15:21 +00:00
parent dc45b9fed3
commit e37a0ac9f8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1100,16 +1100,19 @@ public class PermissionManagerService {
// case of OS update // case of OS update
if (mPackageManagerInt.getInstalledSdkVersion(pkg) if (mPackageManagerInt.getInstalledSdkVersion(pkg)
< Build.VERSION_CODES.Q) { < Build.VERSION_CODES.Q) {
int numSplitPerms = PermissionManager.SPLIT_PERMISSIONS.size(); final List<PermissionManager.SplitPermissionInfo> permissionList =
getSplitPermissions();
int numSplitPerms = permissionList.size();
for (int splitPermNum = 0; splitPermNum < numSplitPerms; for (int splitPermNum = 0; splitPermNum < numSplitPerms;
splitPermNum++) { splitPermNum++) {
PermissionManager.SplitPermissionInfo sp = PermissionManager.SplitPermissionInfo sp =
PermissionManager.SPLIT_PERMISSIONS.get(splitPermNum); permissionList.get(splitPermNum);
String splitPermName = sp.getSplitPermission(); String splitPermName = sp.getSplitPermission();
if (sp.getNewPermissions().contains(permName) if (sp.getNewPermissions().contains(permName)
&& origPermissions.hasInstallPermission(splitPermName)) { && origPermissions.hasInstallPermission(splitPermName)) {
upgradedActivityRecognitionPermission = splitPermName; upgradedActivityRecognitionPermission = splitPermName;
newImplicitPermissions.add(permName); newImplicitPermissions.add(permName);
if (DEBUG_PERMISSIONS) { if (DEBUG_PERMISSIONS) {
Slog.i(TAG, permName + " is newly added for " Slog.i(TAG, permName + " is newly added for "
+ pkg.packageName); + pkg.packageName);