From 11b70f8834cd7a89cbdce3c5861215fd2c79f186 Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Mon, 5 Jun 2017 17:16:55 -0700
Subject: [PATCH] Confirm a11y shortcut service for correct user

Fix came from Sony:
https://partner-android-review.googlesource.com/#/c/829546/

Bug: 62251151
Test: Change shortcut to Switch Access for main user, then
create guest and activate shortcut. The UI used to display
switch access for the guest user as well. Now it displays
TalkBack (which is the service that gets activated by the
shortcut for the Guest; only the UI was wrong.)

Change-Id: If2b90cf260279a342c0ccfde0600544490788d38
---
 .../android/server/policy/AccessibilityShortcutController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
index 7d53310b4e867..3e5e57b6f4ad4 100644
--- 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;
         }