From 695ab4cb7d3c80e1b6e2ced9bd0aa974a466982b Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 1 Mar 2023 18:50:16 +0000
Subject: [PATCH] Changed output of get-main-user.

It will be just the user id when the device supports it, and "None"
when it doesn't.

Test: adb shell cmd user get-main-user
Fixes: 271295369

Change-Id: I1d4ad4765cddade369ce1d7ce515fe5907d84932
---
 .../com/android/server/pm/UserManagerServiceShellCommand.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java b/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
index 333c98c4818da..835ab6a8e8bce 100644
--- a/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
+++ b/services/core/java/com/android/server/pm/UserManagerServiceShellCommand.java
@@ -530,10 +530,10 @@ public class UserManagerServiceShellCommand extends ShellCommand {
         PrintWriter pw = getOutPrintWriter();
         final int mainUserId = mService.getMainUserId();
         if (mainUserId == UserHandle.USER_NULL) {
-            pw.println("Couldn't get main user.");
+            pw.println("None");
             return 1;
         }
-        pw.println("Main user id: " + mainUserId);
+        pw.println(mainUserId);
         return 0;
     }