Merge cherrypicks of ['googleplex-android-review.googlesource.com/23382463',... (2e10a676) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -2171,6 +2171,10 @@ public class Notification implements Parcelable
		}
		}

		private void visitUris(@NonNull Consumer<Uri> visitor) {
		visitIconUri(visitor, getIcon());
		}

		@Override
		public Action clone() {
		return new Action(
		@@ -2856,7 +2860,7 @@ public class Notification implements Parcelable

		if (actions != null) {
		for (Action action : actions) {
		visitIconUri(visitor, action.getIcon());
		action.visitUris(visitor);
		}
		}

		@@ -2947,6 +2951,11 @@ public class Notification implements Parcelable
		if (mBubbleMetadata != null) {
		visitIconUri(visitor, mBubbleMetadata.getIcon());
		}

		if (extras != null && extras.containsKey(WearableExtender.EXTRA_WEARABLE_EXTENSIONS)) {
		WearableExtender extender = new WearableExtender(this);
		extender.visitUris(visitor);
		}
		}

		/**
		@@ -11711,6 +11720,12 @@ public class Notification implements Parcelable
		mFlags &= ~mask;
		}
		}

		private void visitUris(@NonNull Consumer<Uri> visitor) {
		for (Action action : mActions) {
		action.visitUris(visitor);
		}
		}
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -571,6 +571,12 @@ public class NotificationManager {
		*/
		public static final int BUBBLE_PREFERENCE_SELECTED = 2;

		/**
		* Maximum length of the component name of a registered NotificationListenerService.
		* @hide
		*/
		public static int MAX_SERVICE_COMPONENT_NAME_LENGTH = 500;

		@UnsupportedAppUsage
		private static INotificationManager sService;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1008,7 +1008,7 @@ public class LockPatternUtils {
		CREDENTIAL_TYPE_API, CREDENTIAL_TYPE_API, mCredentialTypeQuery);

		/**
		* Invalidate the credential cache
		* Invalidate the credential type cache
		* @hide
		*/
		public final static void invalidateCredentialTypeCache() {

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ namespace android {
		namespace uirenderer {
		namespace renderthread {

		static std::array<std::string_view, 19> sEnableExtensions{
		static std::array<std::string_view, 20> sEnableExtensions{
		VK_KHR_BIND_MEMORY_2_EXTENSION_NAME,
		VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME,
		VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
		@@ -60,6 +60,7 @@ static std::array<std::string_view, 19> sEnableExtensions{
		VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME,
		VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
		VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
		VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME,
		};

		static bool shouldEnableExtension(const std::string_view& extension) {

+6 −2

Original line number	Diff line number	Diff line
		@@ -243,7 +243,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
		return mHelper != null ? mHelper.packageName : null;
		}

		public void updateState(@NonNull String packageName, int uid, boolean isEnabled) {
		/** Updates enabled state based on associated package. */
		public void updateState(
		@NonNull String packageName, int uid, boolean isEnableAllowed, boolean isEnabled) {
		mHelper.updatePackageDetails(packageName, uid);
		if (mAppOpsManager == null) {
		mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
		@@ -254,7 +256,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
		final boolean ecmEnabled = getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
		final boolean appOpsAllowed = !ecmEnabled \|\| mode == AppOpsManager.MODE_ALLOWED;
		if (isEnabled) {
		if (!isEnableAllowed && !isEnabled) {
		setEnabled(false);
		} else if (isEnabled) {
		setEnabled(true);
		} else if (appOpsAllowed && isDisabledByAppOps()) {
		setEnabled(true);