Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5fbb24e authored by Cam Bickel's avatar Cam Bickel Committed by Camden Bickel
Browse files

Cleanup flag "restore_a11y_shortcut_target_..." 

Full flag name:
"restore_a11y_shortcut_target_service"

Note that on line 1869 of AccessibilityManagerServiceTest.java, a
different flag is removed. This flag should have been removed in
http://ag/30554709, but I accidentally removed the flag from this CL
("restore_a11y_shortcut_target_service") instead.

Bug: b/341374402
Test: atest AccessibilityShortcutControllerTest SettingsHelperRestoreTest AccessibilityManagerServiceTest
Flag: EXEMPT flag cleanup
Change-Id: I023fed04527e20f3c547155e70c895b9eebacad3
parent 82a136ad

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

+1 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.util.Slog; 
import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.Flags;

import android.widget.Toast;



import com.android.internal.R;
@@ -289,9 +288,7 @@ public class AccessibilityShortcutController { 
                    cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.SHOWN,

                    userId);

        } else {

            if (Flags.restoreA11yShortcutTargetService()) {

            enableDefaultHardwareShortcut(userId);

            }

            playNotificationTone();

            if (mAlertDialog != null) {

                mAlertDialog.dismiss();

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

+0 −7
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ import android.os.Build; 
import android.os.Handler;

import android.os.Message;

import android.os.Vibrator;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;

import android.speech.tts.TextToSpeech;

import android.speech.tts.Voice;
@@ -73,7 +71,6 @@ import android.view.Display; 
import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.Flags;

import android.view.accessibility.IAccessibilityManager;

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


import org.junit.AfterClass;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -104,8 +100,6 @@ import java.util.Set; 


@RunWith(AndroidJUnit4.class)

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 CharSequence PACKAGE_NAME_STRING = "Service name";

    private static final String SERVICE_NAME_SUMMARY = "Summary";
@@ -535,7 +529,6 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)

    public void testOnAccessibilityShortcut_settingNull_dialogShown_enablesDefaultShortcut()

            throws Exception {

        configureDefaultAccessibilityService();

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

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ public class SettingsHelper { 
                // Don't write it to setting. Let the broadcast receiver in

                // AccessibilityManagerService handle restore/merging logic.

                return;

            } else if (android.view.accessibility.Flags.restoreA11yShortcutTargetService()

                    && Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) {

            } else if (Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) {

                // Don't write it to setting. Let the broadcast receiver in

                // AccessibilityManagerService handle restore/merging logic.

                return;

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

+0 −7
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.content.Context; 
import android.content.Intent;

import android.net.Uri;

import android.os.Build;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;

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



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mockito;
@@ -52,9 +49,6 @@ import java.util.concurrent.ExecutionException; 
@RunWith(AndroidJUnit4.class)

public class SettingsHelperRestoreTest {



    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    private static final float FLOAT_TOLERANCE = 0.01f;



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



    @Test

    @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE)

    public void restoreAccessibilityShortcutTargetService_broadcastSent()

            throws ExecutionException, InterruptedException {

        BroadcastInterceptingContext interceptingContext = new BroadcastInterceptingContext(

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

+19 −25
Original line number Diff line number Diff line
@@ -2257,10 +2257,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        if (shortcutType == QUICK_SETTINGS && !android.view.accessibility.Flags.a11yQsShortcut()) {

            return;

        }

        if (shortcutType == HARDWARE

                && !android.view.accessibility.Flags.restoreA11yShortcutTargetService()) {

            return;

        }



        synchronized (mLock) {

            final AccessibilityUserState userState = getUserStateLocked(UserHandle.USER_SYSTEM);
@@ -2929,7 +2925,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        final String builderValue = builder.toString();

        final String settingValue = TextUtils.isEmpty(builderValue)

                ? defaultEmptyString : builderValue;

        if (android.view.accessibility.Flags.restoreA11yShortcutTargetService()) {

        final String currentValue = Settings.Secure.getStringForUser(

                mContext.getContentResolver(), settingName, userId);

        if (Objects.equals(settingValue, currentValue)) {
@@ -2950,7 +2945,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            //  "overridable by restore" when writing secure settings.

            return;

        }

        }

        final long identity = Binder.clearCallingIdentity();

        try {

            Settings.Secure.putStringForUser(mContext.getContentResolver(),