Merge "Cleanup flag "clear_default_from_a11y_shortcut..."" into main (72061cd0) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2269,8 +2269,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	mContext, shortcutType, userState.mUserId))		mContext, shortcutType, userState.mUserId))
	: userState.getShortcutTargetsLocked(shortcutType);		: userState.getShortcutTargetsLocked(shortcutType);

	if (Flags.clearDefaultFromA11yShortcutTargetServiceRestore()		if (shortcutType == HARDWARE) {
	&& shortcutType == HARDWARE) {
	final String defaultService =		final String defaultService =
	mContext.getString(R.string.config_defaultAccessibilityService);		mContext.getString(R.string.config_defaultAccessibilityService);
	final ComponentName defaultServiceComponent = TextUtils.isEmpty(defaultService)		final ComponentName defaultServiceComponent = TextUtils.isEmpty(defaultService)

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1815,9 +1815,7 @@ public class AccessibilityManagerServiceTest {
	}		}

	@Test		@Test
	@EnableFlags({		@EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)
	android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,
	Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})
	public void restoreShortcutTargets_hardware_alreadyHadDefaultService_doesNotClear() {		public void restoreShortcutTargets_hardware_alreadyHadDefaultService_doesNotClear() {
	final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;		final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;
	mTestableContext.getOrCreateTestableResources().addOverride(		mTestableContext.getOrCreateTestableResources().addOverride(
	@@ -1843,9 +1841,7 @@ public class AccessibilityManagerServiceTest {
	}		}

	@Test		@Test
	@EnableFlags({		@EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)
	android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,
	Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})
	public void restoreShortcutTargets_hardware_didNotHaveDefaultService_clearsDefaultService() {		public void restoreShortcutTargets_hardware_didNotHaveDefaultService_clearsDefaultService() {
	final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;		final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;
	final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();		final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();
	@@ -1870,9 +1866,7 @@ public class AccessibilityManagerServiceTest {
	}		}

	@Test		@Test
	@EnableFlags({		@EnableFlags(Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE)
	android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE,
	Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE})
	public void restoreShortcutTargets_hardware_nullSetting_clearsDefaultService() {		public void restoreShortcutTargets_hardware_nullSetting_clearsDefaultService() {
	final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;		final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME;
	final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();		final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString();