Merge "Clean up launched VDM custom IME flag" into main (7a78b07a) · Commits · e / os / android_frameworks_base

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/companion/virtual/VirtualDeviceManager.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -1116,12 +1116,9 @@ public final class VirtualDeviceManager {
		* @throws SecurityException if the display is not owned by this device or is not
		* {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_TRUSTED trusted}
		*/
		@FlaggedApi(Flags.FLAG_VDM_CUSTOM_IME)
		public void setDisplayImePolicy(int displayId, @WindowManager.DisplayImePolicy int policy) {
		if (Flags.vdmCustomIme()) {
		mVirtualDeviceInternal.setDisplayImePolicy(displayId, policy);
		}
		}

		/**
		* Adds an activity listener to listen for events such as top activity change or virtual

core/java/android/companion/virtual/VirtualDeviceParams.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -440,7 +440,6 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @see Builder#setInputMethodComponent
		*/
		@FlaggedApi(Flags.FLAG_VDM_CUSTOM_IME)
		@Nullable
		public ComponentName getInputMethodComponent() {
		return mInputMethodComponent;
		@@ -945,7 +944,6 @@ public final class VirtualDeviceParams implements Parcelable {
		* @attr ref android.R.styleable#InputMethod_isVirtualDeviceOnly
		* @attr ref android.R.styleable#InputMethod_showInInputMethodPicker
		*/
		@FlaggedApi(Flags.FLAG_VDM_CUSTOM_IME)
		@NonNull
		public Builder setInputMethodComponent(@Nullable ComponentName inputMethodComponent) {
		mInputMethodComponent = inputMethodComponent;

core/java/android/view/inputmethod/InputMethodInfo.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -766,7 +766,6 @@ public final class InputMethodInfo implements Parcelable {
		* Returns true if IME supports only virtual devices.
		* @hide
		*/
		@FlaggedApi(android.companion.virtual.flags.Flags.FLAG_VDM_CUSTOM_IME)
		@SystemApi
		public boolean isVirtualDeviceOnly() {
		return mIsVirtualDeviceOnly;

core/tests/InputMethodCoreTests/src/android/view/inputmethod/InputMethodInfoTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.content.pm.ResolveInfo;
		import android.content.pm.ServiceInfo;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.platform.test.flag.junit.SetFlagsRule;

		@@ -124,7 +123,6 @@ public class InputMethodInfoTest {
		}

		@Test
		@EnableFlags(android.companion.virtual.flags.Flags.FLAG_VDM_CUSTOM_IME)
		public void testIsVirtualDeviceOnly() throws Exception {
		final InputMethodInfo imi = buildInputMethodForTest(R.xml.ime_meta_virtual_device_only);