Merge "Provide a way to override the avoid bad wifi configuration"

framework/src/android/net/ConnectivityManager.java

@@ -4712,6 +4712,22 @@ public class ConnectivityManager {
         }
     }
 
+    /**
+     * Temporarily allow bad wifi to override {@code config_networkAvoidBadWifi} configuration.
+     *
+     * @param timeMs The expired current time. The value should be set within a limited time from
+     *               now.
+     *
+     * @hide
+     */
+    public void setTestAllowBadWifiUntil(long timeMs) {
+        try {
+            mService.setTestAllowBadWifiUntil(timeMs);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     /**
      * Requests that the system open the captive portal app on the specified network.
      *