Snap for 12930767 from 58c49cf03c2a694b1403b62d1dd7b86e77f8a2e7 to 25Q2-release (83d962b7) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ aconfig_declarations_group {
		"com.android.media.flags.projection-aconfig-java",
		"com.android.net.http.flags-aconfig-exported-java",
		"com.android.net.thread.platform.flags-aconfig-java",
		"com.android.permission.flags-aconfig-java-export",
		"com.android.ranging.flags.ranging-aconfig-java-export",
		"com.android.server.contextualsearch.flags-java",
		"com.android.server.flags.services-aconfig-java",
		@@ -115,6 +116,7 @@ aconfig_declarations_group {
		"framework-jobscheduler-job.flags-aconfig-java",
		"framework_graphics_flags_java_lib",
		"hwui_flags_java_lib",
		"icu_exported_aconfig_flags_lib",
		"interaction_jank_monitor_flags_lib",
		"keystore2_flags_java-framework",
		"libcore_exported_aconfig_flags_lib",
		@@ -163,6 +165,14 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// ICU
		java_aconfig_library {
		name: "icu_exported_aconfig_flags_lib",
		aconfig_declarations: "icu_aconfig_flags",
		mode: "exported",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Camera
		java_aconfig_library {
		name: "camera_platform_flags_core_java_lib",
		@@ -1409,6 +1419,7 @@ java_aconfig_library {
		// Content Capture
		aconfig_declarations {
		name: "android.view.contentcapture.flags-aconfig",
		exportable: true,
		package: "android.view.contentcapture.flags",
		container: "system",
		srcs: ["core/java/android/view/contentcapture/flags/*.aconfig"],

OWNERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ omakoto@google.com #{LAST_RESORT_SUGGESTION}
		roosa@google.com #{LAST_RESORT_SUGGESTION}
		smoreland@google.com #{LAST_RESORT_SUGGESTION}
		yamasani@google.com #{LAST_RESORT_SUGGESTION}
		timmurray@google.com #{LAST_RESORT_SUGGESTION}

		# API changes are already covered by API-Review+1 (http://mdb/android-api-council)
		# via https://android.git.corp.google.com/All-Projects/+/refs/meta/config/rules.pl.

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -3462,7 +3462,7 @@ package android.companion.virtual {
		method public void removeSoundEffectListener(@NonNull android.companion.virtual.VirtualDeviceManager.SoundEffectListener);
		method public void setDevicePolicy(int, int);
		method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public void setDevicePolicy(int, int, int);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public void setDisplayImePolicy(int, int);
		method public void setDisplayImePolicy(int, int);
		method public void setShowPointerIcon(boolean);
		method public void unregisterIntentInterceptor(@NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public void wakeUp();
		@@ -3481,7 +3481,7 @@ package android.companion.virtual {
		method public int getDevicePolicy(int);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public java.time.Duration getDimDuration();
		method @Nullable public android.content.ComponentName getHomeComponent();
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @Nullable public android.content.ComponentName getInputMethodComponent();
		method @Nullable public android.content.ComponentName getInputMethodComponent();
		method public int getLockState();
		method @Nullable public String getName();
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public java.time.Duration getScreenOffTimeout();
		@@ -3520,7 +3520,7 @@ package android.companion.virtual {
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDevicePolicy(int, int);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDimDuration(@NonNull java.time.Duration);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setHomeComponent(@Nullable android.content.ComponentName);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setInputMethodComponent(@Nullable android.content.ComponentName);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setInputMethodComponent(@Nullable android.content.ComponentName);
		method @NonNull @RequiresPermission(value=android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY, conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setName(@NonNull String);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setScreenOffTimeout(@NonNull java.time.Duration);
		@@ -19043,7 +19043,7 @@ package android.view.displayhash {
		package android.view.inputmethod {

		public final class InputMethodInfo implements android.os.Parcelable {
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public boolean isVirtualDeviceOnly();
		method public boolean isVirtualDeviceOnly();
		}

		public final class InputMethodManager {

core/java/android/app/INotificationManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -271,6 +271,6 @@ interface INotificationManager

		int[] getAllowedAdjustmentKeyTypes();
		void setAssistantAdjustmentKeyTypeState(int type, boolean enabled);
		int[] getAllowedAdjustmentKeyTypesForPackage(String pkg);
		void setAssistantAdjustmentKeyTypeStateForPackage(String pkg, int type, boolean enabled);
		String[] getTypeAdjustmentDeniedPackages();
		void setTypeAdjustmentForPackageState(String pkg, boolean enabled);
		}

core/java/android/app/NotificationManager.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -2163,12 +2163,10 @@ public class NotificationManager {
		* @hide
		*/
		@FlaggedApi(android.app.Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI)
		public void setAssistantAdjustmentKeyTypeStateForPackage(@NonNull String pkg,
		@Adjustment.Types int type,
		boolean enabled) {
		public void setTypeAdjustmentForPackageState(@NonNull String pkg, boolean enabled) {
		INotificationManager service = service();
		try {
		service.setAssistantAdjustmentKeyTypeStateForPackage(pkg, type, enabled);
		service.setTypeAdjustmentForPackageState(pkg, enabled);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}