Bug 838844 - Add info option to get sutagent user info;r=gbrown

Brli · Feb 8, 2013 · 748b25b · 748b25b
1 parent a293812
commit 748b25b
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java
@@ -131,6 +131,7 @@ public enum Command
         MEMORY ("memory"),
         POWER ("power"),
         PROCESS ("process"),
+        SUTUSERINFO ("sutuserinfo"),
         GETAPPROOT ("getapproot"),
         TESTROOT ("testroot"),
         ALRT ("alrt"),
@@ -435,6 +436,8 @@ public String processCommand(String theCmdLine, PrintWriter out, BufferedInputSt
                     strReturn += GetPowerInfo();
                     strReturn += "\n";
                     strReturn += GetProcessInfo();
+                    strReturn += "\n";
+                    strReturn += GetSutUserInfo();
                     }
                 else
                     {
@@ -481,6 +484,10 @@ public String processCommand(String theCmdLine, PrintWriter out, BufferedInputSt
                             strReturn += GetPowerInfo();
                             break;
 
+                        case SUTUSERINFO:
+                            strReturn += GetSutUserInfo();
+                            break;
+
                         default:
                             break;
                         }
@@ -2607,6 +2614,28 @@ public String GetPowerInfo()
         return (sRet);
         }
 
+    public String GetSutUserInfo()
+        {
+        String sRet = "";
+        try {
+            // based on patch in https://bugzilla.mozilla.org/show_bug.cgi?id=811763
+            Context context = contextWrapper.getApplicationContext();
+            Object userManager = context.getSystemService("user");
+            if (userManager != null) {
+                // if userManager is non-null that means we're running on 4.2+ and so the rest of this
+                // should just work
+                Object userHandle = android.os.Process.class.getMethod("myUserHandle", (Class[])null).invoke(null);
+                Object userSerial = userManager.getClass().getMethod("getSerialNumberForUser", userHandle.getClass()).invoke(userManager, userHandle);
+                sRet += "User Serial:" + userSerial.toString();
+            }
+        } catch (Exception e) {
+            // Guard against any unexpected failures
+            e.printStackTrace();
+        }
+
+        return sRet;
+        }
+
     // todo
     public String GetDiskInfo(String sPath)
         {