Merge cherrypicks of [15800618, 15800895, 15800896, 15800898, 15800900, 15800902, 15800904, 15800906, 15800675, 15800677, 15800968, 15800798, 15800799, 15800801] into security-aosp-rvc-release
Change-Id: Id37d5fcdedd96f350b1a70b60ced3c5e0c97cc54
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java
index 3223c3c..61060f1 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java
@@ -119,6 +119,11 @@
return ImmutableList.copyOf(userProfiles.keySet());
}
+ @Implementation
+ public List<UserHandle> getAllProfiles() {
+ return getUserProfiles();
+ }
+
/**
* If any profiles have been added using {@link #addProfile}, return those profiles.
*