Shows user serial when a new user is created.

Currently it was showing the internal user id, but other commands
(like switch-user and remove-user) uses the (public) serial id.

Bug: 171350084
Test: adb shell dumpsys activity service --user 0 com.afwsamples.testdpc create-user

Change-Id: I326058d7d7c4781d60544791170c9170a17337c2
(cherry picked from commit 0c02a3ca936f5574c81c94d132dc3db1ae5ae72b)

Author: the-felipeal

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGateway.java

@@ -69,10 +69,17 @@ void createAndManageUser(@Nullable String name, int flags,
      */
     void setUserIcon(@NonNull Bitmap icon, @NonNull Consumer<Void> onSuccess, @NonNull Consumer<Exception> onError);
 
-    /** @see {@link android.os.UserManager#getUserForSerialNumber(long)}.*/
+    /**
+     * @see {@link android.os.UserManager#getUserForSerialNumber(long)}.
+     */
     @Nullable
     UserHandle getUserHandle(long serialNumber);
 
+    /**
+     * @see {@link android.os.UserManager#getSerialNumber(UserHandle)}.
+     */
+    long getSerialNumber(@NonNull UserHandle user);
+
     /**
      * See {@link android.app.admin.DevicePolicyManager#removeUser(android.content.ComponentName, UserHandle)}.
      */

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGatewayImpl.java

@@ -121,6 +121,11 @@ public UserHandle getUserHandle(long serialNumber) {
         return mUserManager.getUserForSerialNumber(serialNumber);
     }
 
+    @Override
+    public long getSerialNumber(UserHandle user) {
+        return mUserManager.getSerialNumberForUser(user);
+    }
+
     @Override
     public void removeUser(UserHandle userHandle, Consumer<Void> onSuccess,
             Consumer<Exception> onError) {

app/src/main/java/com/afwsamples/testdpc/ShellCommand.java

@@ -277,7 +277,7 @@ private void createUser() {
         Log.i(TAG, "createUser(): name=" + name + ", flags=" + flags);
 
         mDevicePolicyManagerGateway.createAndManageUser(name, flags,
-                (u) -> onSuccess("User created: %s", u),
+                (u) -> onSuccess("User created: %s", toString(u)),
                 (e) -> onError(e, "Error creating user %s", name));
     }
 
@@ -546,6 +546,10 @@ private void print(String name, Collection<String> collection) {
         collection.forEach((s) -> mWriter.printf("  %s\n", s));
     }
 
+    private String toString(UserHandle user) {
+        return user.toString() + " serial=" + mDevicePolicyManagerGateway.getSerialNumber(user);
+    }
+
     private UserHandle getUserHandleArg(int index) {
         // TODO(b/171350084): check args
         long serialNumber = Long.parseLong(mArgs[index]);