Merge "Add getAvoidBadWifi system API"

core/java/android/net/ConnectivityManager.java

@@ -3698,6 +3698,19 @@ public class ConnectivityManager {
         }
     }
 
+    /**
+     * Determine whether the device is configured to avoid bad wifi.
+     * @hide
+     */
+    @SystemApi
+    public boolean getAvoidBadWifi() {
+        try {
+            return mService.getAvoidBadWifi();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     /**
      * It is acceptable to briefly use multipath data to provide seamless connectivity for
      * time-sensitive user-facing operations when the system default network is temporarily

core/java/android/net/IConnectivityManager.aidl

@@ -165,6 +165,7 @@ interface IConnectivityManager
     void setAvoidUnvalidated(in Network network);
     void startCaptivePortalApp(in Network network);
 
+    boolean getAvoidBadWifi();
     int getMultipathPreference(in Network Network);
 
     NetworkRequest getDefaultRequest();