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

Commit 4e660258 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Modify Dangerous permission state pullers to collect all permissions. 

Test: statsd_testdrive
Bug: 154373877
Change-Id: If9c2ab0d3b0b90e325e4423f0647b8f3e9a0868f
parent 7db76b67

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+7 −8
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ public class StatsPullAtomService extends SystemService { 
                            return pullRoleHolderLocked(atomTag, data);

                        }

                    case FrameworkStatsLog.DANGEROUS_PERMISSION_STATE:

                        // fall-through - same call covers two cases

                    case FrameworkStatsLog.DANGEROUS_PERMISSION_STATE_SAMPLED:

                        synchronized (mDangerousPermissionStateLock) {

                            return pullDangerousPermissionStateLocked(atomTag, data);
@@ -2926,10 +2927,6 @@ public class StatsPullAtomService extends SystemService { 
                            continue;

                        }



                        if (permissionInfo.getProtection() != PROTECTION_DANGEROUS) {

                            continue;

                        }



                        if (permName.startsWith(COMMON_PERMISSION_PREFIX)) {

                            permName = permName.substring(COMMON_PERMISSION_PREFIX.length());

                        }
@@ -2941,15 +2938,17 @@ public class StatsPullAtomService extends SystemService { 
                                    (pkg.requestedPermissionsFlags[permNum]

                                            & REQUESTED_PERMISSION_GRANTED)

                                            != 0,

                                    permissionFlags);

                                    permissionFlags, permissionInfo.getProtection()

                                            | permissionInfo.getProtectionFlags());

                        } else {

                            // DangerousPermissionStateSampled atom.

                            // DangeorusPermissionStateSampled atom.

                            e = FrameworkStatsLog.buildStatsEvent(atomTag, permName,

                                    pkg.applicationInfo.uid,

                                    (pkg.requestedPermissionsFlags[permNum]

                                            & REQUESTED_PERMISSION_GRANTED)

                                            != 0,

                                    permissionFlags);

                                    permissionFlags, permissionInfo.getProtection()

                                            | permissionInfo.getProtectionFlags());

                        }

                        pulledData.add(e);

                    }