Merge "Modify LockScreenPolicyFragment in TestDPC" into ub-testdpc-rvc

TreeHugger Robot · Android (Google) Code Review · commit d8963f3942cd · 2020-02-18T16:40:38.000Z
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java b/app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java
@@ -80,7 +80,6 @@ abstract static class Keys {
 
         static final Set<String> NOT_APPLICABLE_TO_PARENT
                 = new HashSet<>(Arrays.asList(new String[] {
-            KEYGUARD_DISABLE_SECURE_NOTIFICATIONS,
             KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS,
         }));
     }
diff --git a/app/src/main/res/xml/lock_screen_preferences.xml b/app/src/main/res/xml/lock_screen_preferences.xml
@@ -75,7 +75,6 @@
         <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
             android:key="keyguard_disable_secure_notifications"
             android:title="@string/keyguard_disable_secure_notifications"
-            testdpc:admin="deviceOwner"
             testdpc:minSdkVersion="L" />
         <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
             android:key="keyguard_disable_unredacted_notifications"

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ abstract static class Keys {`
`80`	`80`
`81`	`81`	`static final Set<String> NOT_APPLICABLE_TO_PARENT`
`82`	`82`	`= new HashSet<>(Arrays.asList(new String[] {`
`83`		`- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS,`
`84`	`83`	`KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS,`
`85`	`84`	`}));`
`86`	`85`	`}`