PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link PACKAGE_USAGE_STATS with LOADER_USAGE_STATS

Browse Source 
Bug: 148374455
Test: Manual
Test: Create three packages; 1) only request PACKAGE_USAGE_STATS, 2) only request LOADER_USAGE_STATS, 3) request both
Test: Go to Settings -> Apps & Notifications -> Special app access
Test: See that there is only a single entry for "Usage access"
Test: Under "Usage access", see all three test apps appear
Test: Disable access for each application and verify that only the appop for the declared permisson is flipped using
Test: adb shell cmd appops get <<PACKAGE_NAME>>
Change-Id: I7741a703fd4494832347e51e113adf974cc31d2b
This commit is contained in:
Todd Kennedy
2020-01-27 15:15:02 -08:00
parent f160cbed83
commit b6aaed1bfc
3 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/applications/UsageAccessDetails.java
View File

@@ -15,6 +15,10 @@
*/
package com.android.settings.applications;
import static android.app.AppOpsManager.OP_GET_USAGE_STATS;
import static android.app.AppOpsManager.OP_LOADER_USAGE_STATS;
import android.Manifest;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
@@ -104,10 +108,28 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
return false;
}
private static boolean doesAnyPermissionMatch(String permissionToMatch, String[] permissions) {
for (String permission : permissions) {
if (permissionToMatch.equals(permission)) {
return true;
}
}
return false;
}
private void setHasAccess(boolean newState) {
logSpecialPermissionChange(newState, mPackageName);
mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS, mPackageInfo.applicationInfo.uid,
mPackageName, newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
final int newAppOpMode = newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
final int uid = mPackageInfo.applicationInfo.uid;
if (doesAnyPermissionMatch(Manifest.permission.PACKAGE_USAGE_STATS,
mUsageState.packageInfo.requestedPermissions)) {
mAppOpsManager.setMode(OP_GET_USAGE_STATS, uid, mPackageName, newAppOpMode);
}
if (doesAnyPermissionMatch(Manifest.permission.LOADER_USAGE_STATS,
mUsageState.packageInfo.requestedPermissions)) {
mAppOpsManager.setMode(OP_LOADER_USAGE_STATS, uid, mPackageName, newAppOpMode);
}
}
@VisibleForTesting