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

Commit c7efda83 authored by Riley Jones's avatar Riley Jones
Browse files

AccessibilityManager#enableShortcutsForTargets permission adjustment 

Changes how enableShortcutsForTargets checks permission, to allow the system process to call it successfully.

Also, moved the relevant flag code to a new dedicated flag.
Test: atest AccessibilityShortcutControllerTest && atest InvisibleToggleAccessibilityServiceTargetTest
Bug: 332006721
Flag: aconfig migrate_enable_shortcuts ENABLED

Change-Id: I13e45c7b667233412f38edb99e560d808b3d3601
parent 2830e96f

core/java/android/view/accessibility/flags/accessibility_flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -80,6 +80,16 @@ flag { 
    bug: "282821643"

}



flag {

    name: "migrate_enable_shortcuts"

    namespace: "accessibility"

    description: "Refactors deprecated code to use AccessibilityManager#enableShortcutsForTargets."

    bug: "332006721"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "motion_event_observing"

    is_exported: true

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

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public class AccessibilityShortcutController { 
                                // to the Settings.

                                final ComponentName configDefaultService =

                                        ComponentName.unflattenFromString(defaultService);

                                if (Flags.a11yQsShortcut()) {

                                if (Flags.migrateEnableShortcuts()) {

                                    am.enableShortcutsForTargets(true, HARDWARE,

                                            Set.of(configDefaultService.flattenToString()), userId);

                                } else {
@@ -384,7 +384,7 @@ public class AccessibilityShortcutController { 
                                            mContext,

                                            HARDWARE,

                                            userId);

                            if (Flags.a11yQsShortcut()) {

                            if (Flags.migrateEnableShortcuts()) {

                                am.enableShortcutsForTargets(

                                        false, HARDWARE, targetServices, userId);

                            } else {

core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public abstract class AccessibilityTarget implements TargetOperations, OnTargetS 
    @Override

    public void onCheckedChanged(boolean isChecked) {

        setShortcutEnabled(isChecked);

        if (Flags.a11yQsShortcut()) {

        if (Flags.migrateEnableShortcuts()) {

            final AccessibilityManager am =

                    getContext().getSystemService(AccessibilityManager.class);

            am.enableShortcutsForTargets(

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

+8 −8
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @EnableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testClickingDisableButtonInDialog_shouldClearShortcutId() throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);

        configureValidShortcutService();
@@ -443,7 +443,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testClickingDisableButtonInDialog_shouldClearShortcutId_old() throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);

        configureValidShortcutService();
@@ -467,7 +467,7 @@ public class AccessibilityShortcutControllerTest { 


    @Test

    @EnableFlags(Flags.FLAG_UPDATE_ALWAYS_ON_A11Y_SERVICE)

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void turnOffVolumeShortcutForAlwaysOnA11yService_shouldTurnOffA11yService()

            throws Exception {

        configureApplicationTargetSdkVersion(Build.VERSION_CODES.R);
@@ -480,7 +480,7 @@ public class AccessibilityShortcutControllerTest { 


    @Test

    @EnableFlags(Flags.FLAG_UPDATE_ALWAYS_ON_A11Y_SERVICE)

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void turnOffVolumeShortcutForAlwaysOnA11yService_hasOtherTypesShortcut_shouldNotTurnOffA11yService()

            throws Exception {

        configureApplicationTargetSdkVersion(Build.VERSION_CODES.R);
@@ -527,7 +527,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @EnableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testTurnOnDefaultA11yServiceInDialog_defaultServiceShortcutTurnsOn()

            throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);
@@ -551,7 +551,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testTurnOnDefaultA11yServiceInDialog_defaultServiceShortcutTurnsOn_old()

            throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);
@@ -574,7 +574,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @EnableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testTurnOffDefaultA11yServiceInDialog_defaultServiceShortcutTurnsOff()

            throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);
@@ -598,7 +598,7 @@ public class AccessibilityShortcutControllerTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void testTurnOffDefaultA11yServiceInDialog_defaultServiceShortcutTurnsOff_old()

            throws Exception {

        configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);

core/tests/coretests/src/com/android/internal/accessibility/dialog/InvisibleToggleAccessibilityServiceTargetTest.java

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @EnableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_true_callA11yManagerToUpdateShortcuts() throws Exception {

        mSut.onCheckedChanged(true);
@@ -130,7 +130,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @EnableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_false_callA11yManagerToUpdateShortcuts() throws Exception {

        mSut.onCheckedChanged(false);

        verify(mAccessibilityManagerService).enableShortcutsForTargets(
@@ -142,7 +142,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_turnOnShortcut_hasOtherShortcut_serviceKeepsOn() {

        enableA11yService(/* enable= */ true);

        addShortcutForA11yService(
@@ -155,7 +155,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_turnOnShortcut_noOtherShortcut_shouldTurnOnService() {

        enableA11yService(/* enable= */ false);

        addShortcutForA11yService(
@@ -168,7 +168,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_turnOffShortcut_hasOtherShortcut_serviceKeepsOn() {

        enableA11yService(/* enable= */ true);

        addShortcutForA11yService(
@@ -181,7 +181,7 @@ public class InvisibleToggleAccessibilityServiceTargetTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    @DisableFlags(Flags.FLAG_MIGRATE_ENABLE_SHORTCUTS)

    public void onCheckedChanged_turnOffShortcut_noOtherShortcut_shouldTurnOffService() {

        enableA11yService(/* enable= */ true);

        addShortcutForA11yService(