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

Commit 4d35a7cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing Override annotation" into udc-dev am: 7e9609b4 am: 250dc6fe 

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



Change-Id: I667a114eeda82ed96b577f518d1185e893098dfc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ffc4a09 250dc6fe

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -3898,6 +3898,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        }

    }

    }





    @Override

    public boolean isAccessibilityTargetAllowed(String packageName, int uid, int userId) {

    public boolean isAccessibilityTargetAllowed(String packageName, int uid, int userId) {

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();

        try {

        try {
@@ -3921,6 +3922,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        }

    }

    }





    @Override

    public boolean sendRestrictedDialogIntent(String packageName, int uid, int userId) {

    public boolean sendRestrictedDialogIntent(String packageName, int uid, int userId) {

        // The accessibility service is allowed. Don't show the restricted dialog.

        // The accessibility service is allowed. Don't show the restricted dialog.

        if (isAccessibilityTargetAllowed(packageName, uid, userId)) {

        if (isAccessibilityTargetAllowed(packageName, uid, userId)) {