commit 0743a082b7751ce69e7a6e7e8ae6fe4741712812
author Makoto Onuki <omakoto@google.com> Tue Apr 11 19:31:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 19:31:03 2017 +0000
tree 8461b395f3bd0d7ed132f42cdc2cda98be6eb7e7
parent 7a7ed28b26f81a3b1bcbfdf1743e57e936605361
parent d1888109e5c3bec08076433c77b415bf609c3a2d

Merge "Don't try to create user when on a single-user device." into oc-dev am: a8d86dac2f
am: d1888109e5

Change-Id: I2a237a05b32ffa1c2b88a805c1410edc68b06832

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

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java
index d033785..a773737 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java
@@ -27,7 +27,9 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mUserId = createUser();
+        if (isTestEnabled()) {
+            mUserId = createUser();
+        }
     }
 
     @Override