Merge "Fix the issue that P user restrictions preferences are disabled on P." into ub-testdpc-pic

TreeHugger Robot · Android (Google) Code Review · commit b2a8be5e6641 · 2018-06-01T15:15:00.000Z
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java b/app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java
@@ -145,8 +145,7 @@ private void constrainPerferences() {
         }
         for (String restriction: UserRestriction.PIC_PLUS_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
-            // TODO: Replace the following version code with P when ready
-            pref.setMinSdkVersion(Build.VERSION_CODES.CUR_DEVELOPMENT);
+            pref.setMinSdkVersion(Build.VERSION_CODES.P);
         }
         for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ private void constrainPerferences() {`
`145`	`145`	`}`
`146`	`146`	`for (String restriction: UserRestriction.PIC_PLUS_RESTRICTIONS) {`
`147`	`147`	`DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);`
`148`		`- // TODO: Replace the following version code with P when ready`
`149`		`- pref.setMinSdkVersion(Build.VERSION_CODES.CUR_DEVELOPMENT);`
	`148`	`+ pref.setMinSdkVersion(Build.VERSION_CODES.P);`
`150`	`149`	`}`
`151`	`150`	`for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {`
`152`	`151`	`DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);`