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

Commit e682acb2 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "clear calling identity before calling settings provider" into oc-dev am: c240c9b1 

am: a06e779b

Change-Id: Ie2baee0eb27b8c593227dc99e1191a5a44b4c500
parents aae7707e a06e779b

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

+10 −4
Original line number Diff line number Diff line
@@ -2036,10 +2036,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
        }

        if (!shortcutServiceIsInstalled) {

            userState.mServiceToEnableWithShortcut = null;

            final long identity = Binder.clearCallingIdentity();

            try {

                Settings.Secure.putStringForUser(mContext.getContentResolver(),

                        Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, null, userState.mUserId);



                Settings.Secure.putIntForUser(mContext.getContentResolver(),

                        Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 0, userState.mUserId);

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

    }