diff options
3 files changed, 4 insertions, 13 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index db2d450..6c62680 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4152,7 +4152,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } catch (ActivityNotFoundException e) { } } - mContext.startActivity(mHomeIntent); + mContext.startActivityAsUser(mHomeIntent, UserHandle.CURRENT); } /** diff --git a/services/java/com/android/server/UiModeManagerService.java b/services/java/com/android/server/UiModeManagerService.java index f618263..3e83baa 100644 --- a/services/java/com/android/server/UiModeManagerService.java +++ b/services/java/com/android/server/UiModeManagerService.java @@ -463,7 +463,7 @@ class UiModeManagerService extends IUiModeManager.Stub { if (homeIntent != null) { try { - mContext.startActivity(homeIntent); + mContext.startActivityAsUser(homeIntent, UserHandle.CURRENT); } catch (ActivityNotFoundException e) { } } diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 448044a..90e8d73 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -2392,17 +2392,8 @@ public final class ActivityManagerService extends ActivityManagerNative String resultWho, int requestCode, int startFlags, String profileFile, ParcelFileDescriptor profileFd, Bundle options, int userId) { enforceNotIsolatedCaller("startActivity"); - if (userId != UserHandle.getCallingUserId()) { - userId = handleIncomingUserLocked(Binder.getCallingPid(), Binder.getCallingUid(), userId, - false, true, "startActivity", null); - } else { - if (intent.getCategories() != null - && intent.getCategories().contains(Intent.CATEGORY_HOME)) { - // Requesting home, set the identity to the current user - // HACK! - userId = mCurrentUserId; - } - } + userId = handleIncomingUserLocked(Binder.getCallingPid(), Binder.getCallingUid(), userId, + false, true, "startActivity", null); return mMainStack.startActivityMayWait(caller, -1, intent, resolvedType, resultTo, resultWho, requestCode, startFlags, profileFile, profileFd, null, null, options, userId); |