Skip to content

Commit 2f85264

Browse files
acjohnstongAndroid (Google) Code Review
authored andcommitted
Merge "Modify LockScreenPolicyFragment in TestDPC" into ub-testdpc-rvc
2 parents 3a7bab1 + 03b60d9 commit 2f85264

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ abstract static class Keys {
8080

8181
static final Set<String> NOT_APPLICABLE_TO_PARENT
8282
= new HashSet<>(Arrays.asList(new String[] {
83-
KEYGUARD_DISABLE_SECURE_CAMERA,
8483
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS,
8584
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS,
8685
}));

app/src/main/res/xml/lock_screen_preferences.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<com.afwsamples.testdpc.common.preference.DpcSwitchPreference
7272
android:key="keyguard_disable_secure_camera"
7373
android:title="@string/keyguard_disable_secure_camera"
74-
testdpc:admin="deviceOwner"
7574
testdpc:minSdkVersion="L" />
7675
<com.afwsamples.testdpc.common.preference.DpcSwitchPreference
7776
android:key="keyguard_disable_secure_notifications"

0 commit comments

Comments
 (0)