Snap for 13381542 from f1375577aa4841903c32e7b7dcb4030f9ca04455 to 25Q3-release (252ed50b) · Commits · e / os / android_frameworks_base

core/java/android/app/LoadedApk.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1822,7 +1822,8 @@ public final class LoadedApk {

		if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,
		"broadcastReceiveReg: " + intent.getAction());
		"broadcastReceiveReg: " + intent.getAction()
		+ ";clz=" + receiver.getClass().getSimpleName());
		}
		long debugStoreId = -1;
		if (DEBUG_STORE_ENABLED) {

core/java/android/app/PropertyInvalidatedCache.java

+30 −23

Original line number	Diff line number	Diff line
		@@ -974,8 +974,8 @@ public class PropertyInvalidatedCache<Query, Result> {
		//
		// If the "update" boolean is true, then the property is registered with the nonce store
		// before the associated handle is fetched.
		private int initialize(boolean update) {
		synchronized (mLock) {
		@GuardedBy("mLock")
		private int initializeLocked(boolean update) {
		int handle = mHandle;
		if (handle == NonceStore.INVALID_NONCE_INDEX) {
		if (mStore == null) {
		@@ -996,7 +996,6 @@ public class PropertyInvalidatedCache<Query, Result> {
		}
		return handle;
		}
		}

		// Fetch the nonce from shared memory. If the shared memory is not available, return
		// UNSET. If the shared memory is available but the nonce name is not known (it may not
		@@ -1005,11 +1004,13 @@ public class PropertyInvalidatedCache<Query, Result> {
		long getNonceInternal() {
		int handle = mHandle;
		if (handle == NonceStore.INVALID_NONCE_INDEX) {
		handle = initialize(false);
		synchronized (mLock) {
		handle = initializeLocked(false);
		if (handle == NonceStore.INVALID_NONCE_INDEX) {
		return NONCE_UNSET;
		}
		}
		}
		return mStore.getNonce(handle);
		}

		@@ -1019,10 +1020,16 @@ public class PropertyInvalidatedCache<Query, Result> {
		void setNonceInternal(long value) {
		int handle = mHandle;
		if (handle == NonceStore.INVALID_NONCE_INDEX) {
		handle = initialize(true);
		synchronized (mLock) {
		handle = initializeLocked(true);
		if (handle == NonceStore.INVALID_NONCE_INDEX) {
		throw new IllegalStateException("unable to assign nonce handle: " + mName);
		}
		// Note that we set the value within the lock, ensuring it takes effect
		// immediately upon initialization, before any pending getNonce reads.
		mStore.setNonce(handle, value);
		return;
		}
		}
		mStore.setNonce(handle, value);
		}

core/java/android/app/contextualsearch/flags.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -34,17 +34,6 @@ flag {
		}
		}


		flag {
		name: "contextual_search_prevent_self_capture"
		namespace: "sysui_integrations"
		description: "Identify live contextual search UI to exclude from contextual search screenshot."
		bug: "390176823"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "contextual_search_media_projection"
		namespace: "sysui_integrations"

core/java/android/app/notification.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -220,16 +220,6 @@ flag {
		bug: "343631648"
		}

		flag {
		name: "redaction_on_lockscreen_metrics"
		namespace: "systemui"
		description: "enables metrics when redacting notifications on the lockscreen"
		bug: "343631648"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "expanding_public_view"
		namespace: "systemui"

core/java/android/window/TransitionRequestInfo.java

+36 −6

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.window;

		import static android.view.Display.INVALID_DISPLAY;
		import static android.view.WindowManager.transitTypeToString;

		import android.annotation.Nullable;
		@@ -118,13 +119,15 @@ public final class TransitionRequestInfo implements Parcelable {
		public static final class DisplayChange implements Parcelable {
		private final int mDisplayId;

		// If non-null, these bounds changes should ignore any potential rotation changes.
		/** If non-null, these bounds changes should ignore any potential rotation changes. */
		@Nullable private Rect mStartAbsBounds = null;
		@Nullable private Rect mEndAbsBounds = null;

		private int mStartRotation = WindowConfiguration.ROTATION_UNDEFINED;
		private int mEndRotation = WindowConfiguration.ROTATION_UNDEFINED;
		private boolean mPhysicalDisplayChanged = false;
		/** The display to reparent to on disconnect; if invalid, this isn't a disconnect change. */
		private int mDisconnectReparentDisplay = INVALID_DISPLAY;

		/** Create empty display-change. */
		public DisplayChange(int displayId) {
		@@ -158,6 +161,9 @@ public final class TransitionRequestInfo implements Parcelable {
		return mDisplayId;
		}

		/**
		* If non-null, these bounds changes should ignore any potential rotation changes.
		*/
		@DataClass.Generated.Member
		public @Nullable Rect getStartAbsBounds() {
		return mStartAbsBounds;
		@@ -183,6 +189,17 @@ public final class TransitionRequestInfo implements Parcelable {
		return mPhysicalDisplayChanged;
		}

		/**
		* The display to reparent to on disconnect; if invalid, this isn't a disconnect change.
		*/
		@DataClass.Generated.Member
		public int getDisconnectReparentDisplay() {
		return mDisconnectReparentDisplay;
		}

		/**
		* If non-null, these bounds changes should ignore any potential rotation changes.
		*/
		@DataClass.Generated.Member
		public @android.annotation.NonNull DisplayChange setStartAbsBounds(@android.annotation.NonNull Rect value) {
		mStartAbsBounds = value;
		@@ -213,6 +230,15 @@ public final class TransitionRequestInfo implements Parcelable {
		return this;
		}

		/**
		* The display to reparent to on disconnect; if invalid, this isn't a disconnect change.
		*/
		@DataClass.Generated.Member
		public @android.annotation.NonNull DisplayChange setDisconnectReparentDisplay( int value) {
		mDisconnectReparentDisplay = value;
		return this;
		}

		@Override
		@DataClass.Generated.Member
		public String toString() {
		@@ -225,7 +251,8 @@ public final class TransitionRequestInfo implements Parcelable {
		"endAbsBounds = " + mEndAbsBounds + ", " +
		"startRotation = " + mStartRotation + ", " +
		"endRotation = " + mEndRotation + ", " +
		"physicalDisplayChanged = " + mPhysicalDisplayChanged +
		"physicalDisplayChanged = " + mPhysicalDisplayChanged + ", " +
		"disconnectReparentDisplay = " + mDisconnectReparentDisplay +
		" }";
		}

		@@ -245,6 +272,7 @@ public final class TransitionRequestInfo implements Parcelable {
		if (mEndAbsBounds != null) dest.writeTypedObject(mEndAbsBounds, flags);
		dest.writeInt(mStartRotation);
		dest.writeInt(mEndRotation);
		dest.writeInt(mDisconnectReparentDisplay);
		}

		@Override
		@@ -265,6 +293,7 @@ public final class TransitionRequestInfo implements Parcelable {
		Rect endAbsBounds = (flg & 0x4) == 0 ? null : (Rect) in.readTypedObject(Rect.CREATOR);
		int startRotation = in.readInt();
		int endRotation = in.readInt();
		int disconnectReparentDisplay = in.readInt();

		this.mDisplayId = displayId;
		this.mStartAbsBounds = startAbsBounds;
		@@ -272,6 +301,7 @@ public final class TransitionRequestInfo implements Parcelable {
		this.mStartRotation = startRotation;
		this.mEndRotation = endRotation;
		this.mPhysicalDisplayChanged = physicalDisplayChanged;
		this.mDisconnectReparentDisplay = disconnectReparentDisplay;

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -291,10 +321,10 @@ public final class TransitionRequestInfo implements Parcelable {
		};

		@DataClass.Generated(
		time = 1733334462577L,
		time = 1744851977467L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/window/TransitionRequestInfo.java",
		inputSignatures = "private final int mDisplayId\nprivate @android.annotation.Nullable android.graphics.Rect mStartAbsBounds\nprivate @android.annotation.Nullable android.graphics.Rect mEndAbsBounds\nprivate int mStartRotation\nprivate int mEndRotation\nprivate boolean mPhysicalDisplayChanged\nclass DisplayChange extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genSetters=true, genBuilder=false, genConstructor=false)")
		inputSignatures = "private final int mDisplayId\nprivate @android.annotation.Nullable android.graphics.Rect mStartAbsBounds\nprivate @android.annotation.Nullable android.graphics.Rect mEndAbsBounds\nprivate int mStartRotation\nprivate int mEndRotation\nprivate boolean mPhysicalDisplayChanged\nprivate int mDisconnectReparentDisplay\nclass DisplayChange extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genSetters=true, genBuilder=false, genConstructor=false)")
		@Deprecated
		private void __metadata() {}

		@@ -428,7 +458,7 @@ public final class TransitionRequestInfo implements Parcelable {
		};

		@DataClass.Generated(
		time = 1733334462588L,
		time = 1744851977482L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/window/TransitionRequestInfo.java",
		inputSignatures = "private @android.annotation.NonNull android.window.WindowContainerToken mTaskFragmentToken\nprivate @android.annotation.NonNull android.app.ActivityManager.RunningTaskInfo mTaskInfo\nclass PipChange extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genSetters=true, genBuilder=false, genConstructor=false)")
		@@ -687,7 +717,7 @@ public final class TransitionRequestInfo implements Parcelable {
		};

		@DataClass.Generated(
		time = 1733334462604L,
		time = 1744851977497L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/window/TransitionRequestInfo.java",
		inputSignatures = "private final @android.view.WindowManager.TransitionType int mType\nprivate @android.annotation.Nullable android.app.ActivityManager.RunningTaskInfo mTriggerTask\nprivate @android.annotation.Nullable android.window.TransitionRequestInfo.PipChange mPipChange\nprivate @android.annotation.Nullable android.window.RemoteTransition mRemoteTransition\nprivate @android.annotation.Nullable android.window.TransitionRequestInfo.DisplayChange mDisplayChange\nprivate final int mFlags\nprivate final int mDebugId\n java.lang.String typeToString()\nclass TransitionRequestInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genSetters=true, genAidl=true)")