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

Merge "Don't enforce declaration of app op permissions without public API." into rvc-dev am: 16f0eb1ef9 am: 7c4ba46849

Browse Source 
Change-Id: I5662c2a2ef0e236090297790abbe5673da489332
This commit is contained in:
Hai Zhang
2020-05-10 05:30:18 +00:00
committed by Automerger Merge Worker
parent ba43e87d40 7c4ba46849
commit ae8809ccd4
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -208,10 +208,15 @@ public final class PermissionPolicyService extends SystemService {
for (int i = 0; i < appOpPermissionInfosSize; i++) { for (int i = 0; i < appOpPermissionInfosSize; i++) {
final PermissionInfo appOpPermissionInfo = appOpPermissionInfos.get(i); final PermissionInfo appOpPermissionInfo = appOpPermissionInfos.get(i);
final int appOpCode = AppOpsManager.permissionToOpCode(appOpPermissionInfo.name); switch (appOpPermissionInfo.name) {
case android.Manifest.permission.ACCESS_NOTIFICATIONS:
case android.Manifest.permission.MANAGE_IPSEC_TUNNELS:
continue;
default:
final int appOpCode = AppOpsManager.permissionToOpCode(
appOpPermissionInfo.name);
if (appOpCode != OP_NONE) { if (appOpCode != OP_NONE) {
mAppOpPermissions.add(appOpPermissionInfo.name); mAppOpPermissions.add(appOpPermissionInfo.name);
try { try {
appOpsService.startWatchingMode(appOpCode, null, mAppOpsCallback); appOpsService.startWatchingMode(appOpCode, null, mAppOpsCallback);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -219,6 +224,7 @@ public final class PermissionPolicyService extends SystemService {
} }
} }
} }
}
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED); intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);