Snap for 12841171 from 7865c35a3e8523d8ecd8616e706ea6cc17d9c922 to 25Q2-release (9d614e23) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -20781,11 +20781,11 @@ package android.hardware.display {
		method @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public void registerDisplayListener(@NonNull java.util.concurrent.Executor, long, @NonNull android.hardware.display.DisplayManager.DisplayListener);
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_FLAG_DISPLAY_ADDED = 1L; // 0x1L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_FLAG_DISPLAY_CHANGED = 4L; // 0x4L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_FLAG_DISPLAY_REFRESH_RATE = 8L; // 0x8L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_FLAG_DISPLAY_REMOVED = 2L; // 0x2L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_FLAG_DISPLAY_STATE = 16L; // 0x10L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_TYPE_DISPLAY_ADDED = 1L; // 0x1L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_TYPE_DISPLAY_CHANGED = 4L; // 0x4L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_TYPE_DISPLAY_REFRESH_RATE = 8L; // 0x8L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_TYPE_DISPLAY_REMOVED = 2L; // 0x2L
		field @FlaggedApi("com.android.server.display.feature.flags.display_listener_performance_improvements") public static final long EVENT_TYPE_DISPLAY_STATE = 16L; // 0x10L
		field public static final int MATCH_CONTENT_FRAMERATE_ALWAYS = 2; // 0x2
		field public static final int MATCH_CONTENT_FRAMERATE_NEVER = 0; // 0x0
		field public static final int MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY = 1; // 0x1

core/api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -5157,18 +5157,18 @@ package android.hardware.contexthub {
		}

		@FlaggedApi("android.chre.flags.offload_api") public final class HubMessage implements android.os.Parcelable {
		ctor public HubMessage(int, @NonNull byte[]);
		ctor public HubMessage(int, @NonNull byte[], @NonNull android.hardware.contexthub.HubMessage.DeliveryParams);
		method public int describeContents();
		method @NonNull public byte[] getMessageBody();
		method public int getMessageType();
		method public boolean isResponseRequired();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.contexthub.HubMessage> CREATOR;
		}

		public static class HubMessage.DeliveryParams {
		ctor public HubMessage.DeliveryParams(boolean);
		method public boolean isResponseRequired();
		public static final class HubMessage.Builder {
		ctor public HubMessage.Builder(int, @NonNull byte[]);
		method @NonNull public android.hardware.contexthub.HubMessage build();
		method @NonNull public android.hardware.contexthub.HubMessage.Builder setResponseRequired(boolean);
		}

		@FlaggedApi("android.chre.flags.offload_api") public final class HubServiceInfo implements android.os.Parcelable {

core/java/android/credentials/flags.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,16 @@ flag {
		}
		}

		flag {
		namespace: "credential_manager"
		name: "package_update_fix_enabled"
		description: "Enable fix for removing package from settings if app is updated or component is modified"
		bug: "384772470"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "credential_manager"
		name: "settings_activity_enabled"

core/java/android/hardware/contexthub/HubEndpoint.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ public class HubEndpoint {
		}

		if (activeSession == null \|\| mMessageCallback == null) {
		if (message.getDeliveryParams().isResponseRequired()) {
		if (message.isResponseRequired()) {
		try {
		mServiceToken.sendMessageDeliveryStatus(
		sessionId,
		@@ -313,7 +313,7 @@ public class HubEndpoint {
		mMessageCallbackExecutor.execute(
		() -> {
		mMessageCallback.onMessageReceived(activeSession, message);
		if (message.getDeliveryParams().isResponseRequired()) {
		if (message.isResponseRequired()) {
		try {
		mServiceToken.sendMessageDeliveryStatus(
		sessionId,

core/java/android/hardware/contexthub/HubEndpointSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ public class HubEndpointSession implements AutoCloseable {
		throw new IllegalStateException("Session is already closed.");
		}

		boolean isResponseRequired = message.getDeliveryParams().isResponseRequired();
		boolean isResponseRequired = message.isResponseRequired();
		ContextHubTransaction<Void> ret =
		new ContextHubTransaction<>(
		isResponseRequired