diff options
author | Zhentao Sun <robinvane@google.com> | 2015-08-14 15:57:18 -0700 |
---|---|---|
committer | Zhentao Sun <robinvane@google.com> | 2015-08-18 17:05:37 -0700 |
commit | 4354a05f85e92fd8082aaffba0a14a5ab9aa49af (patch) | |
tree | c394a2db00bd1bb7a4f0833308900a99dca87d6d /services/core | |
parent | 36052477465f51a4c690e4e8dfb290fb15ce88b0 (diff) | |
download | frameworks_base-4354a05f85e92fd8082aaffba0a14a5ab9aa49af.zip frameworks_base-4354a05f85e92fd8082aaffba0a14a5ab9aa49af.tar.gz frameworks_base-4354a05f85e92fd8082aaffba0a14a5ab9aa49af.tar.bz2 |
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
Diffstat (limited to 'services/core')
-rw-r--r-- | services/core/java/com/android/server/GestureLauncherService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 1f3d61c..55af9f0 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(); } |