Snap for 11840485 from 944887a0397afe19c829877fe796bbff4b3ecc54 to 24Q3-release (94297ee6) · Commits · e / os / android_frameworks_base

DREAM_MANAGER_OWNERS

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		brycelee@google.com

core/java/android/app/AppCompatTaskInfo.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,11 @@ public class AppCompatTaskInfo implements Parcelable {
		*/
		public boolean topActivityEligibleForLetterboxEducation;

		/**
		* Whether the letterbox education is enabled
		*/
		public boolean isLetterboxEducationEnabled;

		/**
		* Whether the direct top activity is in size compat mode on foreground.
		*/
		@@ -178,6 +183,7 @@ public class AppCompatTaskInfo implements Parcelable {
		== that.topActivityEligibleForUserAspectRatioButton
		&& topActivityEligibleForLetterboxEducation
		== that.topActivityEligibleForLetterboxEducation
		&& isLetterboxEducationEnabled == that.isLetterboxEducationEnabled
		&& topActivityLetterboxVerticalPosition == that.topActivityLetterboxVerticalPosition
		&& topActivityLetterboxHorizontalPosition
		== that.topActivityLetterboxHorizontalPosition
		@@ -192,6 +198,7 @@ public class AppCompatTaskInfo implements Parcelable {
		* Reads the AppCompatTaskInfo from a parcel.
		*/
		void readFromParcel(Parcel source) {
		isLetterboxEducationEnabled = source.readBoolean();
		topActivityInSizeCompat = source.readBoolean();
		topActivityEligibleForLetterboxEducation = source.readBoolean();
		isLetterboxDoubleTapEnabled = source.readBoolean();
		@@ -212,6 +219,7 @@ public class AppCompatTaskInfo implements Parcelable {
		*/
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeBoolean(isLetterboxEducationEnabled);
		dest.writeBoolean(topActivityInSizeCompat);
		dest.writeBoolean(topActivityEligibleForLetterboxEducation);
		dest.writeBoolean(isLetterboxDoubleTapEnabled);
		@@ -232,6 +240,7 @@ public class AppCompatTaskInfo implements Parcelable {
		return "AppCompatTaskInfo { topActivityInSizeCompat=" + topActivityInSizeCompat
		+ " topActivityEligibleForLetterboxEducation= "
		+ topActivityEligibleForLetterboxEducation
		+ "isLetterboxEducationEnabled= " + isLetterboxEducationEnabled
		+ " isLetterboxDoubleTapEnabled= " + isLetterboxDoubleTapEnabled
		+ " topActivityEligibleForUserAspectRatioButton= "
		+ topActivityEligibleForUserAspectRatioButton

core/java/android/app/AppOpsManager.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -482,7 +482,8 @@ public class AppOpsManager {
		UID_STATE_FOREGROUND_SERVICE,
		UID_STATE_FOREGROUND,
		UID_STATE_BACKGROUND,
		UID_STATE_CACHED
		UID_STATE_CACHED,
		UID_STATE_NONEXISTENT
		})
		public @interface UidState {}

		@@ -565,6 +566,12 @@ public class AppOpsManager {
		*/
		public static final int MIN_PRIORITY_UID_STATE = UID_STATE_CACHED;

		/**
		* Special uid state: The UID is not running
		* @hide
		*/
		public static final int UID_STATE_NONEXISTENT = Integer.MAX_VALUE;

		/**
		* Resolves the first unrestricted state given an app op.
		* @param op The op to resolve.
		@@ -596,6 +603,7 @@ public class AppOpsManager {
		UID_STATE_FOREGROUND,
		UID_STATE_BACKGROUND,
		UID_STATE_CACHED
		// UID_STATE_NONEXISTENT isn't a real UID state, so it is excluded
		};

		/** @hide */
		@@ -615,6 +623,8 @@ public class AppOpsManager {
		return "bg";
		case UID_STATE_CACHED:
		return "cch";
		case UID_STATE_NONEXISTENT:
		return "gone";
		default:
		return "unknown";
		}

core/java/android/app/Notification.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -7155,13 +7155,7 @@ public class Notification implements Parcelable
		// Adds any new extras provided by the user.
		if (mUserExtras != null) {
		final Bundle saveExtras = (Bundle) mUserExtras.clone();
		if (SystemProperties.getBoolean(
		"persist.sysui.notification.builder_extras_override", false)) {
		mN.extras.putAll(saveExtras);
		} else {
		saveExtras.putAll(mN.extras);
		mN.extras = saveExtras;
		}
		}

		if (!Flags.sortSectionByTime()) {

core/java/android/app/OWNERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,9 @@ per-file ReceiverInfo* = file:/BROADCASTS_OWNERS
		# ComponentCaller
		per-file ComponentCaller.java = file:COMPONENT_CALLER_OWNERS

		# DreamManager
		per-file DreamManager.java = file:/DREAM_MANAGER_OWNERS

		# GrammaticalInflectionManager
		per-file GrammaticalInflection = file:/services/core/java/com/android/server/grammaticalinflection/OWNERS
		per-file grammatical_inflection_manager.aconfig = file:/services/core/java/com/android/server/grammaticalinflection/OWNERS