Snap for 6826141 from f7de20634cb6b64ddb83445d025c2accd317f506 to rvc-qpr1-release (a4a0444c) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ public class Notification implements Parcelable
		* <p>
		* Avoids spamming the system with overly large strings such as full e-mails.
		*/
		private static final int MAX_CHARSEQUENCE_LENGTH = 5 * 1024;
		private static final int MAX_CHARSEQUENCE_LENGTH = 1024;

		/**
		* Maximum entries of reply text that are accepted by Builder and friends.
		@@ -7821,7 +7821,7 @@ public class Notification implements Parcelable
		*/
		public Message(@NonNull CharSequence text, long timestamp, @Nullable Person sender,
		boolean remoteInputHistory) {
		mText = text;
		mText = safeCharSequence(text);
		mTimestamp = timestamp;
		mSender = sender;
		mRemoteInputHistory = remoteInputHistory;
		@@ -7935,7 +7935,7 @@ public class Notification implements Parcelable
		bundle.putLong(KEY_TIMESTAMP, mTimestamp);
		if (mSender != null) {
		// Legacy listeners need this
		bundle.putCharSequence(KEY_SENDER, mSender.getName());
		bundle.putCharSequence(KEY_SENDER, safeCharSequence(mSender.getName()));
		bundle.putParcelable(KEY_SENDER_PERSON, mSender);
		}
		if (mDataMimeType != null) {

+12 −0

Original line number	Diff line number	Diff line
		@@ -1021,6 +1021,18 @@ public class Build {

		/**
		* R.
		*
		* <p>Applications targeting this or a later release will get these new changes in behavior.
		* For more information about this release, see the
		* <a href="/about/versions/11">Android 11 overview</a>.</p>
		* <ul>
		* <li><a href="/about/versions/11/behavior-changes-all">Behavior changes: all apps</a></li>
		* <li><a href="/about/versions/11/behavior-changes-11">Behavior changes: Apps targeting
		* Android 11</a></li>
		* <li><a href="/about/versions/11/non-sdk-11">Updates to non-SDK interface restrictions
		* in Android 11</a></li>
		* </ul>
		*
		*/
		public static final int R = 30;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public abstract class StorageManagerInternal {
		* affects them.
		*/
		public abstract void onAppOpsChanged(int code, int uid,
		@Nullable String packageName, int mode);
		@Nullable String packageName, int mode, int previousMode);

		/**
		* Asks the StorageManager to reset all state for the provided user; this will result

+1 −4

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
		}

		@Override
		protected boolean shouldShowNavigationBar() {
		protected boolean shouldShowNavigationBarInsets() {
		return true;
		}

		@@ -177,7 +177,6 @@ public class CarKeyguardViewController extends OverlayViewController implements
		mKeyguardStateController.notifyKeyguardState(mShowing, /* occluded= */ false);
		mCarNavigationBarController.showAllKeyguardButtons(/* isSetUp= */ true);
		start();
		getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ true);
		reset(/* hideBouncerWhenShowing= */ false);
		notifyKeyguardUpdateMonitor();
		}
		@@ -192,7 +191,6 @@ public class CarKeyguardViewController extends OverlayViewController implements
		mBouncer.hide(/* destroyView= */ true);
		mCarNavigationBarController.hideAllKeyguardButtons(/* isSetUp= */ true);
		stop();
		getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
		mKeyguardStateController.notifyKeyguardDoneFading();
		mHandler.post(mViewMediatorCallback::keyguardGone);
		notifyKeyguardUpdateMonitor();
		@@ -237,7 +235,6 @@ public class CarKeyguardViewController extends OverlayViewController implements
		public void onCancelClicked() {
		if (mBouncer == null) return;

		getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
		getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);

		mBouncer.hide(/* destroyView= */ true);

+2 −2

Original line number	Diff line number	Diff line
		@@ -193,12 +193,12 @@ public class NotificationPanelViewController extends OverlayPanelViewController
		}

		@Override
		protected boolean shouldShowNavigationBar() {
		protected boolean shouldShowNavigationBarInsets() {
		return true;
		}

		@Override
		protected boolean shouldShowStatusBar() {
		protected boolean shouldShowStatusBarInsets() {
		return true;
		}