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

Browse Source 
Change-Id: I9ef634744e34d82f27a915851f4c89fa4b1937ca
This commit is contained in:
Hai Zhang
2020-05-10 05:15:02 +00:00
committed by Automerger Merge Worker
parent 83bcd39391 16f0eb1ef9
commit 7c4ba46849
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,15 +208,21 @@ public final class PermissionPolicyService extends SystemService {
for (int i = 0; i < appOpPermissionInfosSize; i++) {
final PermissionInfo appOpPermissionInfo = appOpPermissionInfos.get(i);
final int appOpCode = AppOpsManager.permissionToOpCode(appOpPermissionInfo.name);
if (appOpCode != OP_NONE) {
mAppOpPermissions.add(appOpPermissionInfo.name);
try {
appOpsService.startWatchingMode(appOpCode, null, mAppOpsCallback);
} catch (RemoteException e) {
Slog.wtf(LOG_TAG, "Cannot set up app-ops listener", e);
}
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) {
mAppOpPermissions.add(appOpPermissionInfo.name);
try {
appOpsService.startWatchingMode(appOpCode, null, mAppOpsCallback);
} catch (RemoteException e) {
Slog.wtf(LOG_TAG, "Cannot set up app-ops listener", e);
}
}
}
}