From 4354a05f85e92fd8082aaffba0a14a5ab9aa49af Mon Sep 17 00:00:00 2001
From: Zhentao Sun <robinvane@google.com>
Date: Fri, 14 Aug 2015 15:57:18 -0700
Subject: [PATCH] Launched camera in the correct user.

Fixed b/23325974.
The camera was always launched in the device owner's profile. Now it can
work with secondary users.

Change-Id: I826b341a7e73a9dd603dd5df7aa31bfaf4d440c4
---
 .../core/java/com/android/server/GestureLauncherService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java
index 1f3d61c34d229..55af9f02a567e 100644
--- a/services/core/java/com/android/server/GestureLauncherService.java
+++ b/services/core/java/com/android/server/GestureLauncherService.java
@@ -35,6 +35,7 @@ import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.Vibrator;
 import android.provider.MediaStore;
 import android.provider.Settings;
@@ -247,7 +248,7 @@ class GestureLauncherService extends SystemService {
             intent.setComponent(new ComponentName(componentInfo.activityInfo.packageName,
                     componentInfo.activityInfo.name));
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mContext.startActivity(intent);
+            mContext.startActivityAsUser(intent, UserHandle.CURRENT);
             mWakeLock.release();
         }