Merge "Skip appops pulled atom when SQLite is enabled" into main (fe53b5ea) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import static android.os.Process.SYSTEM_UID;
		import static android.os.Process.getUidForPid;
		import static android.os.storage.VolumeInfo.TYPE_PRIVATE;
		import static android.os.storage.VolumeInfo.TYPE_PUBLIC;
		import static android.permission.flags.Flags.enableAllSqliteAppopsAccesses;
		import static android.provider.Settings.Global.NETSTATS_UID_BUCKET_DURATION;
		import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID;
		import static android.util.MathUtils.constrain;
		@@ -1037,8 +1038,10 @@ public class StatsPullAtomService extends SystemService {
		registerExternalStorageInfo();
		registerAppsOnExternalStorageInfo();
		registerFaceSettings();
		if (!enableAllSqliteAppopsAccesses()) {
		registerAppOps();
		registerAttributedAppOps();
		}
		registerRuntimeAppOpAccessMessage();
		registerNotificationRemoteViews();
		registerDangerousPermissionState();
		@@ -4054,6 +4057,9 @@ public class StatsPullAtomService extends SystemService {
		}

		int pullAppOpsLocked(int atomTag, List<StatsEvent> pulledData) {
		if (enableAllSqliteAppopsAccesses()) {
		return StatsManager.PULL_SKIP;
		}
		final long token = Binder.clearCallingIdentity();
		try {
		AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);
		@@ -4133,6 +4139,9 @@ public class StatsPullAtomService extends SystemService {
		}

		int pullAttributedAppOpsLocked(int atomTag, List<StatsEvent> pulledData) {
		if (enableAllSqliteAppopsAccesses()) {
		return StatsManager.PULL_SKIP;
		}
		final long token = Binder.clearCallingIdentity();
		try {
		AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);