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

Commit b73b432a authored by Cam Bickel's avatar Cam Bickel
Browse files

Cleanup flag "manager_package_monitor_logic_fix" 

Bug: b/337392123
Test: atest AccessibilityManagerServiceTest
Flag: EXEMPT flag cleanup
Change-Id: I47f7efaf1af2c2ec47878e3a806184eeb2e0942f
parent 6493c50c

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

+10 −21
Original line number Diff line number Diff line
@@ -6649,7 +6649,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                }

                final AccessibilityUserState userState = mManagerService.getUserStateLocked(userId);



                if (Flags.managerPackageMonitorLogicFix()) {

                if (!doit) {

                    // if we're not handling the stop here, then we only need to know

                    // if any of the force-stopped packages are currently enabled.
@@ -6661,16 +6660,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    mManagerService.onUserStateChangedLocked(userState);

                }

                return false;

                } else {

                    // this old logic did not properly indicate when base packageMonitor's routine

                    // should handle stopping the package.

                    if (doit && mManagerService.onPackagesForceStoppedLocked(packages, userState)) {

                        mManagerService.onUserStateChangedLocked(userState);

                        return false;

                    } else {

                        return true;

                    }

                }

            }

        }

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

+0 −3
Original line number Diff line number Diff line
@@ -1729,7 +1729,6 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANAGER_PACKAGE_MONITOR_LOGIC_FIX)

    public void onHandleForceStop_dontDoIt_packageEnabled_returnsTrue() {

        setupShortcutTargetServices();

        AccessibilityUserState userState = mA11yms.getCurrentUserState();
@@ -1752,7 +1751,6 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANAGER_PACKAGE_MONITOR_LOGIC_FIX)

    public void onHandleForceStop_doIt_packageEnabled_returnsFalse() {

        setupShortcutTargetServices();

        AccessibilityUserState userState = mA11yms.getCurrentUserState();
@@ -1775,7 +1773,6 @@ public class AccessibilityManagerServiceTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MANAGER_PACKAGE_MONITOR_LOGIC_FIX)

    public void onHandleForceStop_dontDoIt_packageNotEnabled_returnsFalse() {

        PackageMonitor monitor = spy(mA11yms.getPackageMonitor());

        when(monitor.getChangingUserId()).thenReturn(UserHandle.USER_SYSTEM);