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

Commit c240c9b1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 682ce663 35ba7ec5

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);

            }

        }

    }