Framework: Show the Advanced reboot menu only for the primary user

Change-Id: I73f82eade26f268e2b4608fa23cabcf0bb8fc862

1 files changed, 9 insertions, 3 deletions

diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java
index ec84bb0..c2c678a0 100644
--- a/services/java/com/android/server/power/ShutdownThread.java
+++ b/services/java/com/android/server/power/ShutdownThread.java
@@ -150,9 +150,11 @@ public final class ShutdownThread extends Thread {
                 sConfirmDialog = null;
             }
             if (mReboot && !mRebootSafeMode) {
-                // See if the advanced reboot menu is enabled and check the keyguard state
-                boolean advancedReboot = Settings.Secure.getInt(context.getContentResolver(),
-                        Settings.Secure.ADVANCED_REBOOT, 0) == 1;
+                // Determine if primary user is logged in
+                boolean isPrimary = UserHandle.getCallingUserId() == UserHandle.USER_OWNER;
+
+                // See if the advanced reboot menu is enabled (only if primary user) and check the keyguard state
+                boolean advancedReboot = isPrimary ? advancedRebootEnabled(context) : false;
                 KeyguardManager km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
                 boolean locked = km.inKeyguardRestrictedInputMode();
 
@@ -219,6 +221,10 @@ public final class ShutdownThread extends Thread {
         }
     }
 
+    private static boolean advancedRebootEnabled(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.ADVANCED_REBOOT, 0) == 1;
+    }
+
     private static class CloseDialogReceiver extends BroadcastReceiver
             implements DialogInterface.OnDismissListener {
         private Context mContext;