Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7266e1fa authored by Les Lee's avatar Les Lee Committed by Android (Google) Code Review
Browse files

Merge "wifi: Deprecate SoftApCallback"

parents d54b5e5e fbac3511

api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -7873,7 +7873,7 @@ package android.net.wifi.nl80211 { 
    method @NonNull public java.util.List<android.net.wifi.nl80211.NativeScanResult> getScanResults(@NonNull String, int);

    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);

    method @Nullable public static android.net.wifi.nl80211.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);

    method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);

    method @Deprecated public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);

    method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SendMgmtFrameCallback);

    method public void setOnServiceDeadCallback(@NonNull Runnable);

    method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback);
@@ -7924,10 +7924,10 @@ package android.net.wifi.nl80211 { 
    field public final int txBitrateMbps;

  }













  public static interface WifiNl80211Manager.SoftApCallback {













    method public void onConnectedClientsChanged(@NonNull android.net.wifi.nl80211.NativeWifiClient, boolean);













    method public void onFailure();













    method public void onSoftApChannelSwitched(int, int);













  @Deprecated public static interface WifiNl80211Manager.SoftApCallback {













    method @Deprecated public void onConnectedClientsChanged(@NonNull android.net.wifi.nl80211.NativeWifiClient, boolean);













    method @Deprecated public void onFailure();













    method @Deprecated public void onSoftApChannelSwitched(int, int);















  }





























  public static class WifiNl80211Manager.TxPacketCounters {

























non-updatable-api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -6864,7 +6864,7 @@ package android.net.wifi.nl80211 {













    method @NonNull public java.util.List<android.net.wifi.nl80211.NativeScanResult> getScanResults(@NonNull String, int);















    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);















    method @Nullable public static android.net.wifi.nl80211.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);













    method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);













    method @Deprecated public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);















    method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SendMgmtFrameCallback);















    method public void setOnServiceDeadCallback(@NonNull Runnable);















    method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback);










@@ -6915,10 +6915,10 @@ package android.net.wifi.nl80211 {













    field public final int txBitrateMbps;















  }



























  public static interface WifiNl80211Manager.SoftApCallback {













    method public void onConnectedClientsChanged(@NonNull android.net.wifi.nl80211.NativeWifiClient, boolean);













    method public void onFailure();













    method public void onSoftApChannelSwitched(int, int);













  @Deprecated public static interface WifiNl80211Manager.SoftApCallback {













    method @Deprecated public void onConnectedClientsChanged(@NonNull android.net.wifi.nl80211.NativeWifiClient, boolean);













    method @Deprecated public void onFailure();













    method @Deprecated public void onSoftApChannelSwitched(int, int);















  }





























  public static class WifiNl80211Manager.TxPacketCounters {

































wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -223,7 +223,11 @@ public class WifiNl80211Manager {













    /**















     * Callbacks for SoftAp interface registered using















     * {@link #registerApCallback(String, Executor, SoftApCallback)}.













     *













     * @deprecated The usage is replaced by vendor HAL













     * {@code android.hardware.wifi.hostapd.V1_3.IHostapdCallback}.















     */













    @Deprecated















    public interface SoftApCallback {















        /**















         * Invoked when there is a fatal failure and the SoftAp is shutdown.










@@ -1121,7 +1125,11 @@ public class WifiNl80211Manager {













     * @param callback Callback for AP events.















     * @return true on success, false on failure (e.g. when called on an interface which has not















     * been set up).













     *













     * @deprecated The usage is replaced by vendor HAL













     * {@code android.hardware.wifi.hostapd.V1_3.IHostapdCallback}.















     */













    @Deprecated















    public boolean registerApCallback(@NonNull String ifaceName,















            @NonNull @CallbackExecutor Executor executor,















            @NonNull SoftApCallback callback) {