Merge "Modify Dangerous permission state pullers to collect all permissions." (f90b99a5) · Commits · e / os / android_frameworks_base

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

+7 −8

Original line number	Diff line number	Diff line
		@@ -614,6 +614,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);
		@@ -3027,10 +3028,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());
		}
		@@ -3042,15 +3039,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);
		}