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

Commit a8cc1986 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Clean up bugfix flag resettable_dynamic_properties" into main

parents ab6a4bcf 9ec1b40a

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -1748,9 +1748,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
    }

    }





    public void resetLocked() {

    public void resetLocked() {

        if (Flags.resettableDynamicProperties()) {

        mAccessibilityServiceInfo.resetDynamicallyConfigurableProperties();

        mAccessibilityServiceInfo.resetDynamicallyConfigurableProperties();

        }

        mSystemSupport.getKeyEventDispatcher().flush(this);

        mSystemSupport.getKeyEventDispatcher().flush(this);

        try {

        try {

            // Clear the proxy in the other process so this

            // Clear the proxy in the other process so this

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,6 @@ public class AccessibilityServiceConnectionTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_RESETTABLE_DYNAMIC_PROPERTIES)

    public void binderDied_resetA11yServiceInfo() {

    public void binderDied_resetA11yServiceInfo() {

        final int flag = AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS;

        final int flag = AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS;

        setServiceBinding(COMPONENT_NAME);

        setServiceBinding(COMPONENT_NAME);