Merge "Cleanup permissions hub flags" into main (b0f800e5) · Commits · e / os / android_frameworks_base

core/java/android/permission/PermissionUsageHelper.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -86,11 +86,6 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
		private static final String PROPERTY_LOCATION_INDICATORS_ENABLED =
		"location_indicators_enabled";

		/**
		* Whether to show the Permissions Hub.
		*/
		private static final String PROPERTY_PERMISSIONS_HUB_2_ENABLED = "permissions_hub_2_enabled";

		/**
		* How long after an access to show it as "recent"
		*/
		@@ -106,14 +101,9 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis
		private static final long DEFAULT_RUNNING_TIME_MS = 5000L;
		private static final long DEFAULT_RECENT_TIME_MS = 15000L;

		private static boolean shouldShowPermissionsHub() {
		return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
		PROPERTY_PERMISSIONS_HUB_2_ENABLED, false);
		}

		private static boolean shouldShowIndicators() {
		return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
		PROPERTY_CAMERA_MIC_ICONS_ENABLED, true) \|\| shouldShowPermissionsHub();
		PROPERTY_CAMERA_MIC_ICONS_ENABLED, true);
		}

		private static boolean shouldShowLocationIndicator() {

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -127,11 +127,6 @@ public final class SystemUiDeviceConfigFlags {

		// Flag related to Privacy Indicators

		/**
		* Whether to show the complete ongoing app ops chip.
		*/
		public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_2_enabled";

		/**
		* Whether to show app ops chip for just microphone + camera.
		*/

services/core/java/com/android/server/appop/HistoricalRegistry.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.app.AppOpsManager.UidState;
		import android.content.ContentResolver;
		import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Debug;
		@@ -46,7 +45,6 @@ import android.os.Message;
		import android.os.Process;
		import android.os.RemoteCallback;
		import android.os.UserHandle;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.util.ArraySet;
		import android.util.LongSparseArray;
		@@ -136,7 +134,6 @@ final class HistoricalRegistry {

		private static final String PARAMETER_DELIMITER = ",";
		private static final String PARAMETER_ASSIGNMENT = "=";
		private static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";

		private volatile @NonNull DiscreteRegistry mDiscreteRegistry;

		@@ -304,10 +301,6 @@ final class HistoricalRegistry {
		void dump(String prefix, PrintWriter pw, int filterUid, @Nullable String filterPackage,
		@Nullable String filterAttributionTag, int filterOp,
		@HistoricalOpsRequestFilter int filter) {
		if (!isApiEnabled()) {
		return;
		}

		synchronized (mOnDiskLock) {
		synchronized (mInMemoryLock) {
		pw.println();
		@@ -371,11 +364,6 @@ final class HistoricalRegistry {
		@OpHistoryFlags int historyFlags, @HistoricalOpsRequestFilter int filter,
		long beginTimeMillis, long endTimeMillis, @OpFlags int flags,
		String[] attributionExemptedPackages, @NonNull RemoteCallback callback) {
		if (!isApiEnabled()) {
		callback.sendResult(new Bundle());
		return;
		}

		final HistoricalOps result = new HistoricalOps(beginTimeMillis, endTimeMillis);

		if ((historyFlags & HISTORY_FLAG_AGGREGATE) != 0) {
		@@ -409,11 +397,6 @@ final class HistoricalRegistry {
		@HistoricalOpsRequestFilter int filter, long beginTimeMillis, long endTimeMillis,
		@OpFlags int flags, @Nullable String[] attributionExemptPkgs,
		@NonNull RemoteCallback callback) {
		if (!isApiEnabled()) {
		callback.sendResult(new Bundle());
		return;
		}

		final long currentTimeMillis = System.currentTimeMillis();
		if (endTimeMillis == Long.MAX_VALUE) {
		endTimeMillis = currentTimeMillis;
		@@ -807,12 +790,6 @@ final class HistoricalRegistry {
		}
		}

		private static boolean isApiEnabled() {
		return Binder.getCallingUid() == Process.myUid()
		\|\| DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
		PROPERTY_PERMISSIONS_HUB_ENABLED, true);
		}

		private static final class Persistence {
		private static final boolean DEBUG = false;