aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Scott <scottjonathan@google.com>2020-02-05 11:41:42 +0000
committerJonathan Scott <scottjonathan@google.com>2020-02-05 13:51:44 +0000
commit0c173ea2925e4b4bba64f0d62a85c66d7fffa9d7 (patch)
treea4851a9ce20dcaf794eb95a3b7f4c8d9780f8ec6
parent0df1148768fde9eb12bf16c21712e0d2233b9c3b (diff)
downloadplatform_external_robolectric-shadows-0c173ea2925e4b4bba64f0d62a85c66d7fffa9d7.tar.gz
platform_external_robolectric-shadows-0c173ea2925e4b4bba64f0d62a85c66d7fffa9d7.tar.bz2
platform_external_robolectric-shadows-0c173ea2925e4b4bba64f0d62a85c66d7fffa9d7.zip
Add setDefaultCrossProfilePackages to shadow.
This will be merged, including tests, into G3 as cl/293336648. Test: All robolectric shadow tests are failing prior to this change. Functionality tested with atest CrossProfileAppsSnapshotTest. Change-Id: I74cc7afbe21ca4e92d11075fbd67f2b7775fc316
-rw-r--r--shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
index dec01f9ff..b5c67555c 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
@@ -93,7 +93,7 @@ public class ShadowDevicePolicyManager {
private final Map<PackageAndPermission, Integer> appPermissionGrantStateMap = new HashMap<>();
private final Map<ComponentName, byte[]> passwordResetTokens = new HashMap<>();
private final Set<ComponentName> componentsWithActivatedTokens = new HashSet<>();
- private final Set<String> defaultCrossProfilePackages = new HashSet<>();
+ private Set<String> defaultCrossProfilePackages = new HashSet<>();
private Collection<String> packagesToFailForSetApplicationHidden = Collections.emptySet();
private Set<String> crossProfileCalendarPackages = Collections.emptySet();
private Context context;
@@ -873,7 +873,7 @@ public class ShadowDevicePolicyManager {
crossProfileCalendarPackages = packageNames;
}
- @Implementation(minSdk=R)
+ @Implementation(minSdk = R)
protected Set<String> getDefaultCrossProfilePackages() {
return new HashSet<>(defaultCrossProfilePackages);
}
@@ -881,5 +881,8 @@ public class ShadowDevicePolicyManager {
public void addDefaultCrossProfilePackage(String packageName) {
defaultCrossProfilePackages.add(packageName);
}
+ public void setDefaultCrossProfilePackages(Set<String> defaultCrossProfilePackages) {
+ this.defaultCrossProfilePackages = new HashSet<>(defaultCrossProfilePackages);
+ }
// END-INTERNAL
}