From 58ddbd76bb307f283c3fb06506da4a43a87f7c6a Mon Sep 17 00:00:00 2001
From: Stephen Chen <stewchen@google.com>
Date: Fri, 6 Jan 2017 15:34:28 -0800
Subject: Expose WifiManager#connect and ActionListener as @SystemApi

This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
---
 api/system-current.txt                      | 6 ++++++
 wifi/java/android/net/wifi/WifiManager.java | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index ecebad5593ba..ca02f179ceb2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27039,6 +27039,7 @@ package android.net.wifi {
     method public static int calculateSignalLevel(int, int);
     method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
     method public static int compareSignalLevel(int, int);
+    method public void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);
     method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);
     method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);
     method public android.net.wifi.WifiManager.WifiLock createWifiLock(java.lang.String);
@@ -27138,6 +27139,11 @@ package android.net.wifi {
     field public static final int WPS_WEP_PROHIBITED = 4; // 0x4
   }
 
+  public static abstract interface WifiManager.ActionListener {
+    method public abstract void onFailure(int);
+    method public abstract void onSuccess();
+  }
+
   public class WifiManager.MulticastLock {
     method public void acquire();
     method public boolean isHeld();
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 618a7192a612..88820cda05bd 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1765,6 +1765,7 @@ public class WifiManager {
      * Interface for callback invocation on an application action
      * @hide
      */
+    @SystemApi
     public interface ActionListener {
         /** The operation succeeded */
         public void onSuccess();
@@ -1976,6 +1977,7 @@ public class WifiManager {
      *
      * @hide
      */
+    @SystemApi
     public void connect(WifiConfiguration config, ActionListener listener) {
         if (config == null) throw new IllegalArgumentException("config cannot be null");
         // Use INVALID_NETWORK_ID for arg1 when passing a config object
-- 
cgit v1.2.3-59-g8ed1b