Merge "Initial app filtering logic" (1ecc9352) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ package android {
		field public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
		field @Deprecated public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
		field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
		field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
		field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
		field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
		field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";

core/java/android/app/AppOpsManager.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -834,9 +834,12 @@ public class AppOpsManager {
		public static final int OP_ACCESS_ACCESSIBILITY = 88;
		/** @hide Read the device identifiers (IMEI / MEID, IMSI, SIM / Build serial) */
		public static final int OP_READ_DEVICE_IDENTIFIERS = 89;
		/** @hide Query all apps on device, regardless of declarations in the calling app manifest */
		public static final int OP_QUERY_ALL_PACKAGES = 90;

		/** @hide */
		@UnsupportedAppUsage
		public static final int _NUM_OP = 90;
		public static final int _NUM_OP = 91;

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -1112,6 +1115,8 @@ public class AppOpsManager {
		public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility";
		/** @hide Read device identifiers */
		public static final String OPSTR_READ_DEVICE_IDENTIFIERS = "android:read_device_identifiers";
		/** @hide Query all packages on device */
		public static final String OPSTR_QUERY_ALL_PACKAGES = "android:query_all_packages";

		// Warning: If an permission is added here it also has to be added to
		// com.android.packageinstaller.permission.utils.EventLogger
		@@ -1273,6 +1278,7 @@ public class AppOpsManager {
		OP_LEGACY_STORAGE, // LEGACY_STORAGE
		OP_ACCESS_ACCESSIBILITY, // ACCESS_ACCESSIBILITY
		OP_READ_DEVICE_IDENTIFIERS, // READ_DEVICE_IDENTIFIERS
		OP_QUERY_ALL_PACKAGES, // QUERY_ALL_PACKAGES
		};

		/**
		@@ -1369,6 +1375,7 @@ public class AppOpsManager {
		OPSTR_LEGACY_STORAGE,
		OPSTR_ACCESS_ACCESSIBILITY,
		OPSTR_READ_DEVICE_IDENTIFIERS,
		OPSTR_QUERY_ALL_PACKAGES,
		};

		/**
		@@ -1466,6 +1473,7 @@ public class AppOpsManager {
		"LEGACY_STORAGE",
		"ACCESS_ACCESSIBILITY",
		"READ_DEVICE_IDENTIFIERS",
		"QUERY_ALL_PACKAGES",
		};

		/**
		@@ -1564,6 +1572,7 @@ public class AppOpsManager {
		null, // no permission for OP_LEGACY_STORAGE
		null, // no permission for OP_ACCESS_ACCESSIBILITY
		null, // no direct permission for OP_READ_DEVICE_IDENTIFIERS
		null, // no permission for OP_QUERY_ALL_PACKAGES
		};

		/**
		@@ -1662,6 +1671,7 @@ public class AppOpsManager {
		null, // LEGACY_STORAGE
		null, // ACCESS_ACCESSIBILITY
		null, // READ_DEVICE_IDENTIFIERS
		null, // QUERY_ALL_PACKAGES
		};

		/**
		@@ -1759,6 +1769,7 @@ public class AppOpsManager {
		false, // LEGACY_STORAGE
		false, // ACCESS_ACCESSIBILITY
		false, // READ_DEVICE_IDENTIFIERS
		false, // QUERY_ALL_PACKAGES
		};

		/**
		@@ -1855,6 +1866,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_DEFAULT, // LEGACY_STORAGE
		AppOpsManager.MODE_ALLOWED, // ACCESS_ACCESSIBILITY
		AppOpsManager.MODE_ERRORED, // READ_DEVICE_IDENTIFIERS
		AppOpsManager.MODE_DEFAULT, // QUERY_ALL_PACKAGES
		};

		/**
		@@ -1955,6 +1967,7 @@ public class AppOpsManager {
		false, // LEGACY_STORAGE
		false, // ACCESS_ACCESSIBILITY
		false, // READ_DEVICE_IDENTIFIERS
		false, // QUERY_ALL_PACKAGES
		};

		/**

core/res/AndroidManifest.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -4599,6 +4599,11 @@
		<permission android:name="android.permission.MONITOR_INPUT"
		android:protectionLevel="signature" />

		<!-- Allows query of any normal app on the device, regardless of manifest declarations. -->
		<permission android:name="android.permission.QUERY_ALL_PACKAGES"
		android:protectionLevel="normal" />
		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>

		<application android:process="system"
		android:persistent="true"
		android:hasCode="false"

core/res/res/values/config.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -1700,11 +1700,16 @@
		<!-- Add packages here -->
		</string-array>

		<!-- The set of system packages on device that are queryable regardless of the contents of their
		manifest. -->
		<string-array name="config_forceQueryablePackages" translatable="false">
		<item>com.android.settings</item>
		<!-- Add packages here -->
		</string-array>

		<!-- If true, will force all packages on any system partition as queryable regardless of the
		contents of their manifest. -->
		<bool name="config_forceSystemPackagesQueryable">false</bool>

		<!-- Component name of the default wallpaper. This will be ImageWallpaper if not
		specified -->

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -787,6 +787,7 @@
		<java-symbol type="string" name="emergency_calls_only" />
		<java-symbol type="array" name="config_ephemeralResolverPackage" />
		<java-symbol type="array" name="config_forceQueryablePackages" />
		<java-symbol type="bool" name="config_forceSystemPackagesQueryable" />
		<java-symbol type="string" name="eventTypeAnniversary" />
		<java-symbol type="string" name="eventTypeBirthday" />
		<java-symbol type="string" name="eventTypeCustom" />