From faa4b3cb06f3b10ece1f1d246a3530fc2f30a6da Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Wed, 6 Aug 2014 20:33:09 +0100 Subject: [PATCH] Disallow switching managed profile to foreground Another check in the ActivityManager to stop us from getting into an invalid state by a fat-fingered 'am switch' etc. @bug 16814252 Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69 --- .../java/com/android/server/am/ActivityManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ae2ef06caf111..07ad9e4c4cd65 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -17244,6 +17244,10 @@ public final class ActivityManagerService extends ActivityManagerNative Slog.w(TAG, "No user info for user #" + userId); return false; } + if (foreground && userInfo.isManagedProfile()) { + Slog.w(TAG, "Cannot switch to User #" + userId + ": not a full user"); + return false; + } if (foreground) { mWindowManager.startFreezingScreen(R.anim.screen_user_exit,