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

Commit ab6fa946 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am:... 

Merge "Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca5 am: 7ba78da3 am: 10e870c7" into tm-d1-dev-plus-aosp am: bd5a58af am: 9b2f4814

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232548



Change-Id: I6489fcf2ba4b1ee1d5bde89cb62cac4c8703a748
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e154315 9b2f4814

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

+0 −9
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        intentFilter.addAction(Intent.ACTION_USER_SWITCHED);

        intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);

        intentFilter.addAction(Intent.ACTION_USER_REMOVED);

        intentFilter.addAction(Intent.ACTION_USER_PRESENT);

        intentFilter.addAction(Intent.ACTION_SETTING_RESTORED);



        mContext.registerReceiverAsUser(new BroadcastReceiver() {
@@ -749,14 +748,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    unlockUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));

                } else if (Intent.ACTION_USER_REMOVED.equals(action)) {

                    removeUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));

                } else if (Intent.ACTION_USER_PRESENT.equals(action)) {

                    // We will update when the automation service dies.

                    synchronized (mLock) {

                        AccessibilityUserState userState = getCurrentUserStateLocked();

                        if (readConfigurationForUserStateLocked(userState)) {

                            onUserStateChangedLocked(userState);

                        }

                    }

                } else if (Intent.ACTION_SETTING_RESTORED.equals(action)) {

                    final String which = intent.getStringExtra(Intent.EXTRA_SETTING_NAME);

                    if (Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(which)) {