Merge "Manage WiFi configurations without location permission" into ub-testdpc-sc

Author: TreeHugger Robot

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

@@ -48,6 +48,7 @@
 import android.location.LocationManager;
 import android.net.ProxyInfo;
 import android.net.Uri;
+import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
@@ -390,6 +391,8 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
             = "create_eap_tls_wifi_configuration";
     private static final String WIFI_CONFIG_LOCKDOWN_ENABLE_KEY = "enable_wifi_config_lockdown";
     private static final String MODIFY_WIFI_CONFIGURATION_KEY = "modify_wifi_configuration";
+    private static final String MODIFY_OWNED_WIFI_CONFIGURATION_KEY = "modify_owned_wifi_configuration";
+    private static final String REMOVE_NOT_OWNED_WIFI_CONFIGURATION_KEY = "remove_not_owned_wifi_configurations";
     private static final String TRANSFER_OWNERSHIP_KEY = "transfer_ownership_to_component";
     private static final String TAG_WIFI_CONFIG_CREATION = "wifi_config_creation";
     private static final String SECURITY_PATCH_FORMAT = "yyyy-MM-dd";
@@ -735,6 +738,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 findPreference(WIFI_CONFIG_LOCKDOWN_ENABLE_KEY);
         mLockdownAdminConfiguredNetworksPreference.setOnPreferenceChangeListener(this);
         findPreference(MODIFY_WIFI_CONFIGURATION_KEY).setOnPreferenceClickListener(this);
+        findPreference(MODIFY_OWNED_WIFI_CONFIGURATION_KEY).setOnPreferenceClickListener(this);
+        findPreference(REMOVE_NOT_OWNED_WIFI_CONFIGURATION_KEY).setOnPreferenceClickListener(this);
         findPreference(TRANSFER_OWNERSHIP_KEY).setOnPreferenceClickListener(this);
         findPreference(SHOW_WIFI_MAC_ADDRESS_KEY).setOnPreferenceClickListener(this);
         mInstallNonMarketAppsPreference = (DpcSwitchPreference) findPreference(
@@ -1279,7 +1284,19 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
                 showEapTlsWifiConfigCreationDialog();
                 return true;
             case MODIFY_WIFI_CONFIGURATION_KEY:
-                showFragment(new WifiModificationFragment());
+                showFragment(WifiModificationFragment.createFragment(false));
+                return true;
+            case MODIFY_OWNED_WIFI_CONFIGURATION_KEY:
+                showFragment(WifiModificationFragment.createFragment(true));
+                return true;
+            case REMOVE_NOT_OWNED_WIFI_CONFIGURATION_KEY:
+                boolean removed = getContext().getSystemService(WifiManager.class)
+                    .removeNonCallerConfiguredNetworks();
+                if (removed) {
+                    showToast("One or more networks are removed");
+                } else {
+                    showToast("No network is removed");
+                }
                 return true;
             case SHOW_WIFI_MAC_ADDRESS_KEY:
                 showWifiMacAddress();

app/src/main/java/com/afwsamples/testdpc/policy/wifimanagement/WifiModificationFragment.java

@@ -56,17 +56,26 @@
 public class WifiModificationFragment extends Fragment
         implements WifiConfigCreationDialog.Listener {
 
+    // Fragment argument: if set, ony list networks added by TestDPC itself. This causes
+    // the fragment to switch to different WifiManager APIs that don't rely on location permission.
+    private static final String ARG_OWNED_NETWORKS_ONLY = "owned_networks_only";
     private static final String TAG_WIFI_CONFIG_MODIFICATION = "wifi_config_modification";
     private ListView mConfigsList;
     private ConfigsAdapter mConfigsAdapter;
     private List<WifiConfiguration> mConfiguredNetworks = new ArrayList<>();
     private WifiManager mWifiManager;
+    private boolean mShowOwnedNetworksOnly;
 
     private void updateConfigsList() {
         mConfiguredNetworks.clear();
         // WifiManager deprecated APIs including #getConfiguredNetworks are restricted to system apps and DPCs
         // https://developer.android.com/preview/privacy/camera-connectivity#wifi-network-config-restrictions
-        List<WifiConfiguration> configuredNetworks = mWifiManager.getConfiguredNetworks();
+        List<WifiConfiguration> configuredNetworks;
+        if (mShowOwnedNetworksOnly) {
+            configuredNetworks = mWifiManager.getCallerConfiguredNetworks();
+        } else {
+            configuredNetworks = mWifiManager.getConfiguredNetworks();
+        }
         if (configuredNetworks != null) {
             mConfiguredNetworks.addAll(configuredNetworks);
         }
@@ -138,6 +147,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     public View onCreateView(LayoutInflater inflater, final ViewGroup container,
             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
+        mShowOwnedNetworksOnly = getArguments().getBoolean(ARG_OWNED_NETWORKS_ONLY);
         mWifiManager = (WifiManager)getActivity().getSystemService(Context.WIFI_SERVICE);
         View view = inflater.inflate(R.layout.wifi_config_modification, container, false);
 
@@ -204,7 +214,6 @@ public void onClick(View v) {
                 }
             });
         }
-
         return view;
     }
 
@@ -217,11 +226,13 @@ public void onDismiss() {
     public void onCancel() {
     }
 
-    public static boolean shouldRequestLocationPermission(Context context) {
+    public boolean shouldRequestLocationPermission(Context context) {
         if (Util.SDK_INT < VERSION_CODES.M) {
             return false;
         }
-
+        if (mShowOwnedNetworksOnly) {
+            return false;
+        }
         return ContextCompat.checkSelfPermission(context, permission.ACCESS_FINE_LOCATION)
                 != PackageManager.PERMISSION_GRANTED;
     }
@@ -239,4 +250,12 @@ private void showToast(String msg) {
         }
         Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show();
     }
+
+    public static WifiModificationFragment createFragment(boolean showOwnedNetworksOnly) {
+        WifiModificationFragment fragment = new WifiModificationFragment();
+        Bundle args = new Bundle();
+        args.putBoolean(ARG_OWNED_NETWORKS_ONLY, showOwnedNetworksOnly);
+        fragment.setArguments(args);
+        return fragment;
+    }
 }

app/src/main/res/values/strings.xml

@@ -328,12 +328,15 @@
     <string name="wifi_config_fail">Failed to save the WI-FI configuration.</string>
     <string name="enable_wifi_config_lockdown">DO created WI-FI configs are modifiable only by DO</string>
     <string name="modify_wifi_configuration">Modify WI-FI configuration</string>
+    <string name="modify_owned_wifi_configuration">Modify Owned WI-FI configuration</string>
+    <string name="remove_not_owned_wifi_configurations">Remove all networks not owned by DO</string>
     <string name="show_wifi_mac_address">Show Wi-Fi MAC address</string>
     <string name="show_wifi_mac_address_title">Wi-Fi MAC address</string>
     <string name="show_wifi_mac_address_not_available_msg">Wi-Fi MAC is not available</string>
     <string name="wifi_configs_header">Saved WI-FI configurations</string>
     <string name="wifi_update_config_button">Update selected</string>
     <string name="wifi_remove_config_button">Remove selected</string>
+    <string name="wifi_remove_all_config_button">Remove All</string>
     <string name="wifi_modification_error_title">Error modifying config</string>
     <string name="wifi_remove_config_error">Unable to remove SSID \'<xliff:g id="wifi_ssid">%1$s</xliff:g>\': netId = <xliff:g id="wifi_network_id">%2$d</xliff:g></string>
     <string name="create_eap_tls_wifi_configuration">Create EAP-TLS WI-FI configuration</string>

app/src/main/res/xml/device_policy_header.xml

@@ -337,6 +337,16 @@
             android:title="@string/modify_wifi_configuration"
             testdpc:admin="any"
             testdpc:minSdkVersion="L" />
+        <com.afwsamples.testdpc.common.preference.DpcPreference
+            android:key="modify_owned_wifi_configuration"
+            android:title="@string/modify_owned_wifi_configuration"
+            testdpc:admin="any"
+            testdpc:minSdkVersion="S" />
+        <com.afwsamples.testdpc.common.preference.DpcPreference
+            android:key="remove_not_owned_wifi_configurations"
+            android:title="@string/remove_not_owned_wifi_configurations"
+            testdpc:admin="deviceOwner"
+            testdpc:minSdkVersion="S" />
         <com.afwsamples.testdpc.common.preference.DpcPreference
             android:key="show_wifi_mac_address"
             android:title="@string/show_wifi_mac_address"
@@ -633,7 +643,7 @@
             android:key="logout_user"
             android:title="@string/logout_user"
             testdpc:minSdkVersion="P"
-            testdpc:user="secondaryUser" /> 
+            testdpc:user="secondaryUser" />
         <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
             android:key="enable_logout"
             android:title="@string/enable_logout"