Merge "clear calling identity before calling settings provider" into oc-dev (a06e779b) · Commits · e / os / android_frameworks_base

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

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2036,10 +2036,16 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
	}		}
	if (!shortcutServiceIsInstalled) {		if (!shortcutServiceIsInstalled) {
	userState.mServiceToEnableWithShortcut = null;		userState.mServiceToEnableWithShortcut = null;
			final long identity = Binder.clearCallingIdentity();
			try {
	Settings.Secure.putStringForUser(mContext.getContentResolver(),		Settings.Secure.putStringForUser(mContext.getContentResolver(),
	Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, null, userState.mUserId);		Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, null, userState.mUserId);

	Settings.Secure.putIntForUser(mContext.getContentResolver(),		Settings.Secure.putIntForUser(mContext.getContentResolver(),
	Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 0, userState.mUserId);		Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, 0, userState.mUserId);
			} finally {
			Binder.restoreCallingIdentity(identity);
			}
	}		}
	}		}