Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 944bfd47 authored Mar 10, 2023 by Android Build Coastguard Worker

Snap for 9720638 from 35ee3e1b to tm-qpr3-release

Change-Id: I093722417bf6f5c14bbb78d048042de3f0f0d0af

parents 5e7583fb 35ee3e1b

core/java/android/app/Notification.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -6965,8 +6965,10 @@ public class Notification implements Parcelable
		/**
		* Returns whether an app can colorize due to the android.permission.USE_COLORIZED_NOTIFICATIONS
		* permission. The permission is checked when a notification is enqueued.
		*
		* @hide
		*/
		private boolean hasColorizedPermission() {
		public boolean hasColorizedPermission() {
		return (flags & Notification.FLAG_CAN_COLORIZE) != 0;
		}

core/java/android/service/dreams/DreamService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1409,6 +1409,10 @@ public class DreamService extends Service implements Window.Callback {
		// Request the DreamOverlay be told to dream with dream's window
		// parameters once the window has been attached.
		mDreamStartOverlayConsumer = overlay -> {
		if (mWindow == null) {
		Slog.d(TAG, "mWindow is null");
		return;
		}
		try {
		overlay.startDream(mWindow.getAttributes(), mOverlayCallback,
		mDreamComponent.flattenToString(),

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -6092,4 +6092,8 @@

		<!-- Whether to show weather on the lock screen by default. -->
		<bool name="config_lockscreenWeatherEnabledByDefault">false</bool>

		<!-- Whether we should persist the brightness value in nits for the default display even if
		the underlying display device changes. -->
		<bool name="config_persistBrightnessNitsForDefaultDisplay">false</bool>
		</resources>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2282,6 +2282,7 @@
		<java-symbol type="bool" name="config_preventImeStartupUnlessTextEditor" />
		<java-symbol type="array" name="config_nonPreemptibleInputMethods" />
		<java-symbol type="bool" name="config_enhancedConfirmationModeEnabled" />
		<java-symbol type="bool" name="config_persistBrightnessNitsForDefaultDisplay" />

		<java-symbol type="layout" name="resolver_list" />
		<java-symbol type="id" name="resolver_list" />

data/etc/services.core.protolog.json

+6 −0

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,12 @@
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/WindowContainer.java"
		},
		"-1104347731": {
		"message": "Setting requested orientation %s for %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"-1103716954": {
		"message": "Not removing %s due to exit animation",
		"level": "VERBOSE",