Merge "Cleanup flag "restore_a11y_shortcut_target_..."" into main (f9226ec7) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,6 @@ import android.util.Slog;
	import android.view.Window;		import android.view.Window;
	import android.view.WindowManager;		import android.view.WindowManager;
	import android.view.accessibility.AccessibilityManager;		import android.view.accessibility.AccessibilityManager;
	import android.view.accessibility.Flags;
	import android.widget.Toast;		import android.widget.Toast;

	import com.android.internal.R;		import com.android.internal.R;
	@@ -289,9 +288,7 @@ public class AccessibilityShortcutController {
	cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.SHOWN,		cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.SHOWN,
	userId);		userId);
	} else {		} else {
	if (Flags.restoreA11yShortcutTargetService()) {
	enableDefaultHardwareShortcut(userId);		enableDefaultHardwareShortcut(userId);
	}
	playNotificationTone();		playNotificationTone();
	if (mAlertDialog != null) {		if (mAlertDialog != null) {
	mAlertDialog.dismiss();		mAlertDialog.dismiss();

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -63,8 +63,6 @@ import android.os.Build;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	import android.os.Vibrator;		import android.os.Vibrator;
	import android.platform.test.annotations.EnableFlags;
	import android.platform.test.flag.junit.SetFlagsRule;
	import android.provider.Settings;		import android.provider.Settings;
	import android.speech.tts.TextToSpeech;		import android.speech.tts.TextToSpeech;
	import android.speech.tts.Voice;		import android.speech.tts.Voice;
	@@ -73,7 +71,6 @@ import android.view.Display;
	import android.view.Window;		import android.view.Window;
	import android.view.WindowManager;		import android.view.WindowManager;
	import android.view.accessibility.AccessibilityManager;		import android.view.accessibility.AccessibilityManager;
	import android.view.accessibility.Flags;
	import android.view.accessibility.IAccessibilityManager;		import android.view.accessibility.IAccessibilityManager;
	import android.widget.Toast;		import android.widget.Toast;

	@@ -86,7 +83,6 @@ import com.android.internal.util.test.FakeSettingsProvider;

	import org.junit.AfterClass;		import org.junit.AfterClass;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	import org.mockito.ArgumentCaptor;		import org.mockito.ArgumentCaptor;
	@@ -104,8 +100,6 @@ import java.util.Set;

	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class AccessibilityShortcutControllerTest {		public class AccessibilityShortcutControllerTest {
	@Rule
	public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
	private static final String SERVICE_NAME_STRING = "fake.package/fake.service.name";		private static final String SERVICE_NAME_STRING = "fake.package/fake.service.name";
	private static final CharSequence PACKAGE_NAME_STRING = "Service name";		private static final CharSequence PACKAGE_NAME_STRING = "Service name";
	private static final String SERVICE_NAME_SUMMARY = "Summary";		private static final String SERVICE_NAME_SUMMARY = "Summary";
	@@ -535,7 +529,6 @@ public class AccessibilityShortcutControllerTest {
	}		}

	@Test		@Test
	@EnableFlags(Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)
	public void testOnAccessibilityShortcut_settingNull_dialogShown_enablesDefaultShortcut()		public void testOnAccessibilityShortcut_settingNull_dialogShown_enablesDefaultShortcut()
	throws Exception {		throws Exception {
	configureDefaultAccessibilityService();		configureDefaultAccessibilityService();

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -242,8 +242,7 @@ public class SettingsHelper {
	// Don't write it to setting. Let the broadcast receiver in		// Don't write it to setting. Let the broadcast receiver in
	// AccessibilityManagerService handle restore/merging logic.		// AccessibilityManagerService handle restore/merging logic.
	return;		return;
	} else if (android.view.accessibility.Flags.restoreA11yShortcutTargetService()		} else if (Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) {
	&& Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) {
	// Don't write it to setting. Let the broadcast receiver in		// Don't write it to setting. Let the broadcast receiver in
	// AccessibilityManagerService handle restore/merging logic.		// AccessibilityManagerService handle restore/merging logic.
	return;		return;

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,6 @@ import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Build;		import android.os.Build;
	import android.platform.test.annotations.EnableFlags;
	import android.platform.test.flag.junit.SetFlagsRule;
	import android.provider.Settings;		import android.provider.Settings;
	import android.provider.SettingsStringUtil;		import android.provider.SettingsStringUtil;

	@@ -37,7 +35,6 @@ import androidx.test.runner.AndroidJUnit4;
	import com.android.internal.util.test.BroadcastInterceptingContext;		import com.android.internal.util.test.BroadcastInterceptingContext;

	import org.junit.Before;		import org.junit.Before;
	import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	import org.mockito.Mockito;		import org.mockito.Mockito;
	@@ -52,9 +49,6 @@ import java.util.concurrent.ExecutionException;
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class SettingsHelperRestoreTest {		public class SettingsHelperRestoreTest {

	@Rule
	public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

	private static final float FLOAT_TOLERANCE = 0.01f;		private static final float FLOAT_TOLERANCE = 0.01f;

	private Context mContext;		private Context mContext;
	@@ -211,7 +205,6 @@ public class SettingsHelperRestoreTest {
	}		}

	@Test		@Test
	@EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)
	public void restoreAccessibilityShortcutTargetService_broadcastSent()		public void restoreAccessibilityShortcutTargetService_broadcastSent()
	throws ExecutionException, InterruptedException {		throws ExecutionException, InterruptedException {
	BroadcastInterceptingContext interceptingContext = new BroadcastInterceptingContext(		BroadcastInterceptingContext interceptingContext = new BroadcastInterceptingContext(

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+19 −25

Original line number	Original line	Diff line number	Diff line
	@@ -2256,10 +2256,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	if (shortcutType == QUICK_SETTINGS && !android.view.accessibility.Flags.a11yQsShortcut()) {		if (shortcutType == QUICK_SETTINGS && !android.view.accessibility.Flags.a11yQsShortcut()) {
	return;		return;
	}		}
	if (shortcutType == HARDWARE
	&& !android.view.accessibility.Flags.restoreA11yShortcutTargetService()) {
	return;
	}

	synchronized (mLock) {		synchronized (mLock) {
	final AccessibilityUserState userState = getUserStateLocked(UserHandle.USER_SYSTEM);		final AccessibilityUserState userState = getUserStateLocked(UserHandle.USER_SYSTEM);
	@@ -2928,7 +2924,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	final String builderValue = builder.toString();		final String builderValue = builder.toString();
	final String settingValue = TextUtils.isEmpty(builderValue)		final String settingValue = TextUtils.isEmpty(builderValue)
	? defaultEmptyString : builderValue;		? defaultEmptyString : builderValue;
	if (android.view.accessibility.Flags.restoreA11yShortcutTargetService()) {
	final String currentValue = Settings.Secure.getStringForUser(		final String currentValue = Settings.Secure.getStringForUser(
	mContext.getContentResolver(), settingName, userId);		mContext.getContentResolver(), settingName, userId);
	if (Objects.equals(settingValue, currentValue)) {		if (Objects.equals(settingValue, currentValue)) {
	@@ -2949,7 +2944,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	// "overridable by restore" when writing secure settings.		// "overridable by restore" when writing secure settings.
	return;		return;
	}		}
	}
	final long identity = Binder.clearCallingIdentity();		final long identity = Binder.clearCallingIdentity();
	try {		try {
	Settings.Secure.putStringForUser(mContext.getContentResolver(),		Settings.Secure.putStringForUser(mContext.getContentResolver(),