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

Merge "Add PermissionFlags field to DangerousPermissionState atom." into qt-dev

Browse Source
This commit is contained in:
Stanislav Zholnin
2019-05-24 10:43:54 +00:00
committed by Android (Google) Code Review
parent 51f286c974 75c3fd1ef5
commit d904cb583b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/statsd/src/atoms.proto
View File

@@ -6139,6 +6139,9 @@ message DangerousPermissionState {
// If the permission is granted to the uid
optional bool is_granted = 4;
// Permission flags as per android.content.pm.PermissionFlags
optional int32 permission_flags = 5;
}
/**

5
services/core/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -1963,8 +1963,12 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
String permName = pkg.requestedPermissions[permNum];
PermissionInfo permissionInfo;
int permissionFlags = 0;
try {
permissionInfo = pm.getPermissionInfo(permName, 0);
permissionFlags =
pm.getPermissionFlags(permName, pkg.packageName, user);
} catch (PackageManager.NameNotFoundException ignored) {
continue;
}
@@ -1979,6 +1983,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
e.writeString(permName);
e.writeInt(pkg.applicationInfo.uid);
e.writeString(pkg.packageName);
e.writeInt(permissionFlags);
e.writeBoolean((pkg.requestedPermissionsFlags[permNum]
& REQUESTED_PERMISSION_GRANTED) != 0);