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

Merge "Precache calls to PermissionManager to avoid calls which use shared PackageManager and PermissionManager lock." into rvc-dev am: f6fa2536aa am: 0a0aeeaf10

Browse Source 
Change-Id: I2356ec6d879d0f7048bfbefb8e49c81411fb5722
This commit is contained in:
TreeHugger Robot
2020-05-18 10:53:41 +00:00
committed by Automerger Merge Worker
parent 9acc5b49d5 0a0aeeaf10
commit 09dc8a7efe
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -289,6 +289,7 @@ public class StatsPullAtomService extends SystemService {
private StatsPullAtomCallbackImpl mStatsCallbackImpl; private StatsPullAtomCallbackImpl mStatsCallbackImpl;
private int mAppOpsSamplingRate = 0; private int mAppOpsSamplingRate = 0;
private final ArraySet<Integer> mDangerousAppOpsList = new ArraySet<>();
// Baselines that stores list of NetworkStats right after initializing, with associated // Baselines that stores list of NetworkStats right after initializing, with associated
// information. This is used to calculate difference when pulling // information. This is used to calculate difference when pulling
@@ -526,6 +527,25 @@ public class StatsPullAtomService extends SystemService {
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "failed to initialize healthHalWrapper"); Slog.e(TAG, "failed to initialize healthHalWrapper");
} }
// Initialize list of AppOps related to DangerousPermissions
PackageManager pm = mContext.getPackageManager();
for (int op = 0; op < AppOpsManager._NUM_OP; op++) {
String perm = AppOpsManager.opToPermission(op);
if (perm == null) {
continue;
} else {
PermissionInfo permInfo;
try {
permInfo = pm.getPermissionInfo(perm, 0);
if (permInfo.getProtection() == PROTECTION_DANGEROUS) {
mDangerousAppOpsList.add(op);
}
} catch (PackageManager.NameNotFoundException exception) {
continue;
}
}
}
} }
void registerEventListeners() { void registerEventListeners() {
@@ -3113,22 +3133,8 @@ public class StatsPullAtomService extends SystemService {
e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_PULLED)); e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_PULLED));
e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_PULLED)); e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_PULLED));
e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_PULLED)); e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_PULLED));
e.writeBoolean(mDangerousAppOpsList.contains(op.getOpCode()));
String perm = AppOpsManager.opToPermission(op.getOpCode());
if (perm == null) {
e.writeBoolean(false);
} else {
PermissionInfo permInfo;
try {
permInfo = mContext.getPackageManager().getPermissionInfo(
perm,
0);
e.writeBoolean(
permInfo.getProtection() == PROTECTION_DANGEROUS);
} catch (PackageManager.NameNotFoundException exception) {
e.writeBoolean(false);
}
}
if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) { if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) {
e.writeInt(mAppOpsSamplingRate); e.writeInt(mAppOpsSamplingRate);
} }