Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev

wifi/java/android/net/wifi/IWifiManager.aidl

@@ -52,6 +52,8 @@ interface IWifiManager
 
     List<WifiConfiguration> getConfiguredNetworks();
 
+    boolean hasCarrierConfiguredNetworks();
+
     List<WifiConfiguration> getPrivilegedConfiguredNetworks();
 
     WifiConfiguration getMatchingWifiConfig(in ScanResult scanResult);

wifi/java/android/net/wifi/WifiManager.java

@@ -746,6 +746,15 @@ public class WifiManager {
         }
     }
 
+    /** @hide */
+    public boolean hasCarrierConfiguredNetworks() {
+        try {
+            return mService.hasCarrierConfiguredNetworks();
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     /** @hide */
     @SystemApi
     public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {