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

am: 03a5b3a509 Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90
2017-06-08 05:52:11 +00:00
parent de066fd249 03a5b3a509
commit 7c44479edf
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
@@ -234,7 +234,7 @@ public class AccessibilityShortcutController {

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