Merge "WifiSsidPolicy replace static method with constructor"

2 files changed, 18 insertions, 29 deletions

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index b0883b6b7439..2558bfc38bdb 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -14969,7 +14969,8 @@ public class DevicePolicyManager {
                     wifiSsidAllowlist.add(
                             WifiSsid.fromBytes(ssid.getBytes(StandardCharsets.UTF_8)));
                 }
-                return WifiSsidPolicy.createAllowlistPolicy(new ArraySet<>(wifiSsidAllowlist));
+                return new WifiSsidPolicy(WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST,
+                        new ArraySet<>(wifiSsidAllowlist));
             }
             List<String> denylist = mService.getSsidDenylist();
             if (!denylist.isEmpty()) {
@@ -14978,7 +14979,8 @@ public class DevicePolicyManager {
                     wifiSsidDenylist.add(
                             WifiSsid.fromBytes(ssid.getBytes(StandardCharsets.UTF_8)));
                 }
-                return WifiSsidPolicy.createDenylistPolicy(new ArraySet<>(wifiSsidDenylist));
+                return new WifiSsidPolicy(WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST,
+                        new ArraySet<>(wifiSsidDenylist));
             }
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
diff --git a/core/java/android/app/admin/WifiSsidPolicy.java b/core/java/android/app/admin/WifiSsidPolicy.java
index a7046d41704a..e91807535c6e 100644
--- a/core/java/android/app/admin/WifiSsidPolicy.java
+++ b/core/java/android/app/admin/WifiSsidPolicy.java
@@ -73,41 +73,28 @@ public final class WifiSsidPolicy implements Parcelable {
     private @WifiSsidPolicyType int mPolicyType;
     private ArraySet<WifiSsid> mSsids;
 
-    private WifiSsidPolicy(@WifiSsidPolicyType int policyType, @NonNull Set<WifiSsid> ssids) {
-        mPolicyType = policyType;
-        mSsids = new ArraySet<>(ssids);
-    }
-
-    private WifiSsidPolicy(Parcel in) {
-        mPolicyType = in.readInt();
-        mSsids = (ArraySet<WifiSsid>) in.readArraySet(null);
-    }
     /**
-     * Create the allowlist Wi-Fi SSID Policy.
+     * Create the Wi-Fi SSID Policy.
      *
-     * @param ssids allowlist of {@link WifiSsid}
-     * @throws IllegalArgumentException if the input ssids list is empty
+     * @param policyType indicate whether the policy is an allowlist or a denylist
+     * @param ssids set of {@link WifiSsid}
+     * @throws IllegalArgumentException if the input ssids set is empty or the policyType is invalid
      */
-    @NonNull
-    public static WifiSsidPolicy createAllowlistPolicy(@NonNull Set<WifiSsid> ssids) {
+    public WifiSsidPolicy(@WifiSsidPolicyType int policyType, @NonNull Set<WifiSsid> ssids) {
         if (ssids.isEmpty()) {
             throw new IllegalArgumentException("SSID list cannot be empty");
         }
-        return new WifiSsidPolicy(WIFI_SSID_POLICY_TYPE_ALLOWLIST, ssids);
+        if (policyType != WIFI_SSID_POLICY_TYPE_ALLOWLIST
+                && policyType != WIFI_SSID_POLICY_TYPE_DENYLIST) {
+            throw new IllegalArgumentException("Invalid policy type");
+        }
+        mPolicyType = policyType;
+        mSsids = new ArraySet<>(ssids);
     }
 
-    /**
-     * Create the denylist Wi-Fi SSID Policy.
-     *
-     * @param ssids denylist of {@link WifiSsid}
-     * @throws IllegalArgumentException if the input ssids list is empty
-     */
-    @NonNull
-    public static WifiSsidPolicy createDenylistPolicy(@NonNull Set<WifiSsid> ssids) {
-        if (ssids.isEmpty()) {
-            throw new IllegalArgumentException("SSID list cannot be empty");
-        }
-        return new WifiSsidPolicy(WIFI_SSID_POLICY_TYPE_DENYLIST, ssids);
+    private WifiSsidPolicy(Parcel in) {
+        mPolicyType = in.readInt();
+        mSsids = (ArraySet<WifiSsid>) in.readArraySet(null);
     }
 
     /**