Merge "Confirm a11y shortcut service for correct user" into oc-dev

am: 03a5b3a509 Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
2017-06-08 01:45:56 +00:00
parent b6a16546b5 03a5b3a509
commit 3d5bf99e7f
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
+++ b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
@@ -233,7 +233,7 @@ public class AccessibilityShortcutController {

    private AccessibilityServiceInfo getInfoForTargetService() {
        final String currentShortcutServiceString = getTargetServiceComponentNameString(
-                mContext, UserHandle.myUserId());
+                mContext, UserHandle.USER_CURRENT);
        if (currentShortcutServiceString == null) {
            return null;
        }