Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d904cb58 authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by Android (Google) Code Review
Browse files

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

parents 51f286c9 75c3fd1e

cmds/statsd/src/atoms.proto

+3 −0
Original line number Diff line number Diff line
@@ -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;

}



/**

services/core/java/com/android/server/stats/StatsCompanionService.java

+5 −0
Original line number Diff line number Diff line
@@ -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);