commit eeacfebd7b3d4a8fdc1cc4fbbf168d51d36eb3ae
author Pavel Grafov <pgrafov@google.com> Wed Jun 19 16:27:37 2019 +0100
committer Felipe Leme <felipeal@google.com> Tue Nov 26 16:08:22 2019 -0800
tree 00e8fc02d9c860b11e8727e62d1aceb4ec918f27
parent 575e1a8b1316e09cd239de8c993a4b48cb5de5e1

Update dumpsys user parser for user serial number.

Now the output line has isPrimary and looks like this:
UserInfo{0:Owner:13} serialNo=0 isPrimary=true

Bug: 135594398
Fixes: 145212151
Test: atest CrossProfileAppsHostSideTest#testPrimaryUserToPrimaryUser
Change-Id: I2091d49fabae1e2109efabed07583a8639886871
(cherry picked from commit b52cc83d31cd657bbfd0a0f0e72ba3ec3c7ebc16)

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
index eecf6df..145cf9b 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
@@ -46,6 +46,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
@@ -579,21 +581,15 @@
 
     protected int getUserSerialNumber(int userId) throws DeviceNotAvailableException{
         // TODO: Move this logic to ITestDevice.
-        // dumpsys user return lines like "UserInfo{0:Owner:13} serialNo=0"
-        String commandOutput = getDevice().executeShellCommand("dumpsys user");
-        String[] tokens = commandOutput.split("\\n");
-        for (String token : tokens) {
-            token = token.trim();
-            if (token.contains("UserInfo{" + userId + ":")) {
-                String[] split = token.split("serialNo=");
-                assertTrue(split.length == 2);
-                int serialNumber = Integer.parseInt(split[1]);
-                CLog.d("Serial number of user " + userId + ": "
-                        + serialNumber);
-                return serialNumber;
-            }
+        // dumpsys user output contains lines like "UserInfo{0:Owner:13} serialNo=0 isPrimary=true"
+        final Pattern pattern =
+                Pattern.compile("UserInfo\\{" + userId + ":[^\\n]*\\sserialNo=(\\d+)\\s");
+        final String commandOutput = getDevice().executeShellCommand("dumpsys user");
+        final Matcher matcher = pattern.matcher(commandOutput);
+        if (matcher.find()) {
+            return Integer.parseInt(matcher.group(1));
         }
-        fail("Couldn't find user " + userId);
+        fail("Couldn't find serial number for user " + userId);
         return -1;
     }