Snap for 5892339 from 2ee661e5847e09b457c75ce52397e392e34d6763 to qt-qpr1-release (f54856ef) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+27 −12

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 Read location metadata from media */
		public static final int OP_ACCESS_MEDIA_LOCATION = 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";
		@@ -1107,6 +1110,9 @@ public class AppOpsManager {
		@TestApi
		@SystemApi
		public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		/** @hide Read location metadata from media */
		public static final String OPSTR_ACCESS_MEDIA_LOCATION = "android:access_media_location";

		/** @hide Interact with accessibility. */
		@SystemApi
		public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility";
		@@ -1134,6 +1140,7 @@ public class AppOpsManager {
		// Storage
		OP_READ_EXTERNAL_STORAGE,
		OP_WRITE_EXTERNAL_STORAGE,
		OP_ACCESS_MEDIA_LOCATION,
		// Location
		OP_COARSE_LOCATION,
		OP_FINE_LOCATION,
		@@ -1273,6 +1280,7 @@ public class AppOpsManager {
		OP_LEGACY_STORAGE, // LEGACY_STORAGE
		OP_ACCESS_ACCESSIBILITY, // ACCESS_ACCESSIBILITY
		OP_READ_DEVICE_IDENTIFIERS, // READ_DEVICE_IDENTIFIERS
		OP_ACCESS_MEDIA_LOCATION, // ACCESS_MEDIA_LOCATION
		};

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

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

		/**
		@@ -1564,6 +1574,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
		Manifest.permission.ACCESS_MEDIA_LOCATION,
		};

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

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

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

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

		/**
		@@ -2587,7 +2602,7 @@ public class AppOpsManager {
		* @return The proxy UID.
		*/
		public int getProxyUid() {
		return (int) findFirstNonNegativeForFlagsInStates(mDurations,
		return (int) findFirstNonNegativeForFlagsInStates(mProxyUids,
		MAX_PRIORITY_UID_STATE, MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
		}

		@@ -2609,7 +2624,7 @@ public class AppOpsManager {
		* @return The proxy UID.
		*/
		public int getProxyUid(@UidState int uidState, @OpFlags int flags) {
		return (int) findFirstNonNegativeForFlagsInStates(mDurations,
		return (int) findFirstNonNegativeForFlagsInStates(mProxyUids,
		uidState, uidState, flags);
		}

		@@ -4169,8 +4184,8 @@ public class AppOpsManager {
		* end UID states.
		*
		* @param counts The data array.
		* @param beginUidState The beginning UID state (exclusive).
		* @param endUidState The end UID state.
		* @param beginUidState The beginning UID state (inclusive).
		* @param endUidState The end UID state (inclusive).
		* @param flags The UID flags.
		* @return The sum.
		*/
		@@ -4199,13 +4214,13 @@ public class AppOpsManager {
		* end UID states.
		*
		* @param counts The data array.
		* @param beginUidState The beginning UID state (inclusive).
		* @param endUidState The end UID state (inclusive).
		* @param flags The UID flags.
		* @param beginUidState The beginning UID state (exclusive).
		* @param endUidState The end UID state.
		* @return The non-negative value or -1.
		*/
		private static long findFirstNonNegativeForFlagsInStates(@Nullable LongSparseLongArray counts,
		@OpFlags int flags, @UidState int beginUidState, @UidState int endUidState) {
		@UidState int beginUidState, @UidState int endUidState, @OpFlags int flags) {
		if (counts == null) {
		return -1;
		}
		@@ -4231,14 +4246,14 @@ public class AppOpsManager {
		* end UID states.
		*
		* @param counts The data array.
		* @param beginUidState The beginning UID state (inclusive).
		* @param endUidState The end UID state (inclusive).
		* @param flags The UID flags.
		* @param beginUidState The beginning UID state (exclusive).
		* @param endUidState The end UID state.
		* @return The non-negative value or -1.
		*/
		private static @Nullable String findFirstNonNullForFlagsInStates(
		@Nullable LongSparseArray<String> counts, @OpFlags int flags,
		@UidState int beginUidState, @UidState int endUidState) {
		@Nullable LongSparseArray<String> counts, @UidState int beginUidState,
		@UidState int endUidState, @OpFlags int flags) {
		if (counts == null) {
		return null;
		}

core/java/android/content/pm/LauncherApps.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -519,9 +519,9 @@ public class LauncherApps {
		* <li>The app is a system app.</li>
		* <li>The app doesn't request any <a href="/guide/topics/permissions/overview">permissions</a>.
		* </li>
		* <li>The <code><application></code> tag in the app's manifest doesn't contain any child
		* elements that represent
		* <a href="/guide/components/fundamentals#DeclaringComponents">app components</a>.</li>
		* <li>The app doesn't have a <em>launcher activity</em> that is enabled by default. A launcher
		* activity has an intent containing the <code>ACTION_MAIN</code> action and the
		* <code>CATEGORY_LAUNCHER</code> category.</li>
		* </ul>
		*
		* <p>Additionally, the system hides synthesized activities for some or all apps in the

core/java/android/content/pm/PackageList.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,13 @@ public class PackageList implements PackageListObserver, AutoCloseable {
		}
		}

		@Override
		public void onPackageChanged(String packageName, int uid) {
		if (mWrappedObserver != null) {
		mWrappedObserver.onPackageChanged(packageName, uid);
		}
		}

		@Override
		public void onPackageRemoved(String packageName, int uid) {
		if (mWrappedObserver != null) {

core/java/android/widget/ScrollView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -71,9 +71,9 @@ import java.util.List;
		* instead of scroll view which offers greater user interface flexibility and
		* support for the material design scrolling patterns.</p>
		*
		* <p>To learn more about material design patterns for handling scrolling, see
		* <a href="https://material.io/guidelines/patterns/scrolling-techniques.html#">
		* Scrolling techniques</a>.</p>
		* <p>Material Design offers guidelines on how the appearance of
		* <a href="https://material.io/components/">several UI components</a>, including app bars and
		* banners, should respond to gestures.</p>
		*
		* @attr ref android.R.styleable#ScrollView_fillViewport
		*/

core/proto/android/app/settings_enums.proto

+5 −0

Original line number	Diff line number	Diff line
		@@ -2401,4 +2401,9 @@ enum PageId {
		// OS: Q
		// Note: Gear icon is shown next to gesture navigation preference and opens sensitivity dialog
		SETTINGS_GESTURE_NAV_BACK_SENSITIVITY_DLG = 1748;

		// OPEN: Settings > System > Aware > Aware Display
		// CATEGORY: SETTINGS
		// OS: Q
		SETTINGS_AWARE_DISPLAY = 1750;
		}