| Index: components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
|
| diff --git a/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java b/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
|
| index 11b7be2da65f77bd8c0f8a24b43e222162aba313..7af5bdc843cb14fa3a33525ddf703130aedbe927 100644
|
| --- a/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
|
| +++ b/components/policy/android/javatests/src/org/chromium/policy/test/annotations/Policies.java
|
| @@ -134,8 +134,13 @@ public final class Policies {
|
| public static class RegistrationHook implements PreTestHook {
|
| @Override
|
| public void run(Context targetContext, Method testMethod) {
|
| - final Bundle policyBundle = PolicyData.asBundle(getPolicies(testMethod).values());
|
| - AbstractAppRestrictionsProvider.setTestRestrictions(policyBundle);
|
| + Map<String, PolicyData> policyMap = getPolicies(testMethod);
|
| + if (policyMap.isEmpty()) {
|
| + AbstractAppRestrictionsProvider.setTestRestrictions(null);
|
| + } else {
|
| + final Bundle policyBundle = PolicyData.asBundle(policyMap.values());
|
| + AbstractAppRestrictionsProvider.setTestRestrictions(policyBundle);
|
| + }
|
| }
|
| }
|
| }
|
|
|