From 9f47a5d85eca1f93833b328dea3d31fc36d79591 Mon Sep 17 00:00:00 2001
From: pkanwar <pkanwar@google.com>
Date: Sat, 17 Dec 2016 20:16:48 -0800
Subject: [PATCH] DO NOT MERGE: Add API to indicate carrier networks.

Bug: 31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
---
 wifi/java/android/net/wifi/IWifiManager.aidl | 2 ++
 wifi/java/android/net/wifi/WifiManager.java  | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 6c95865b98787..5fa080e0012d6 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/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);
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 7fa2c47679c3c..e2d5ae3814b9b 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/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() {