No public description

PiperOrigin-RevId: 595643197

Author: jscott1989

src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -756,13 +756,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
     findPreference(SHOW_WIFI_MAC_ADDRESS_KEY).setOnPreferenceClickListener(this);
     mInstallNonMarketAppsPreference =
         (DpcSwitchPreference) findPreference(INSTALL_NONMARKET_APPS_KEY);
-    mInstallNonMarketAppsPreference.setCustomConstraint(
-        () ->
-            (mUserManager.hasUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES)
-                    || mUserManager.hasUserRestriction(
-                        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY))
-                ? R.string.user_restricted
-                : NO_CUSTOM_CONSTRAINT);
+    mInstallNonMarketAppsPreference.setCustomConstraint(this::validateInstallNonMarketApps);
     mInstallNonMarketAppsPreference.setOnPreferenceChangeListener(this);
     findPreference(SET_USER_RESTRICTIONS_KEY).setOnPreferenceClickListener(this);
     mUserRestrictionsParentPreference =
@@ -4697,6 +4691,18 @@ private int validateDeviceOwnerOrDelegationNetworkLoggingBeforeS() {
     return NO_CUSTOM_CONSTRAINT;
   }
 
+  private int validateInstallNonMarketApps() {
+    if (Util.SDK_INT >= VERSION_CODES.O
+        && getActivity().getApplicationInfo().targetSdkVersion >= VERSION_CODES.O) {
+      return R.string.deprecated_since_oreo;
+    }
+    if (mUserManager.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
+        || mUserManager.hasUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
+      return R.string.user_restricted;
+    }
+    return NO_CUSTOM_CONSTRAINT;
+  }
+
   interface ManageLockTaskListCallback {
     void onPositiveButtonClicked(String[] lockTaskArray);
   }

src/main/res/values/strings.xml

@@ -112,6 +112,7 @@
     <string name="requires_device_owner_or_delegation_security_logging">Requires device owner or delegation-security-logging</string>
 
     <string name="not_for_parent_profile">Not applicable to parent profile</string>
+    <string name="deprecated_since_oreo">Deprecated since Android Oreo</string>
     <string name="user_restricted">Disallowed by user restriction</string>
     <string name="requires_network_logs">Requires network logging to be enabled</string>
     <string name="requires_security_logs">Requires security logging to be enabled</string>