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

Commit c7482b1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate WifiNl80211Manager.signalPoll()"

parents 2031b4ed 75888949

core/api/system-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -9485,7 +9485,7 @@ package android.net.wifi.nl80211 { 
    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);

    method public boolean setupInterfaceForSoftApMode(@NonNull String);

    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.SignalPollResult signalPoll(@NonNull String);

    method @Deprecated @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.SignalPollResult signalPoll(@NonNull String);

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

    method @Deprecated public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>);

    method public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>, @Nullable android.os.Bundle);
@@ -9531,11 +9531,11 @@ package android.net.wifi.nl80211 { 
    method public void onFailure(int);

  }













  public static class WifiNl80211Manager.SignalPollResult {













    field public final int associationFrequencyMHz;













    field public final int currentRssiDbm;













    field public final int rxBitrateMbps;













    field public final int txBitrateMbps;













  @Deprecated public static class WifiNl80211Manager.SignalPollResult {













    field @Deprecated public final int associationFrequencyMHz;













    field @Deprecated public final int currentRssiDbm;













    field @Deprecated public final int rxBitrateMbps;













    field @Deprecated public final int txBitrateMbps;















  }





























  @Deprecated public static interface WifiNl80211Manager.SoftApCallback {

























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



+8
−0




























Original line number
Diff line number
Diff line








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





























    /**















     * Result of a signal poll requested using {@link #signalPoll(String)}.













     *













     * @deprecated The usage is replaced by













     * {@code com.android.server.wifi.WifiSignalPollResults}.















     */













    @Deprecated















    public static class SignalPollResult {















        /** @hide */















        public SignalPollResult(int currentRssiDbm, int txBitrateMbps, int rxBitrateMbps,










@@ -876,7 +880,11 @@ public class WifiNl80211Manager {













     *















     * @return A {@link SignalPollResult} object containing interface statistics, or a null on















     * error (e.g. the interface hasn't been set up yet).













     *













     * @deprecated replaced by













     * {@link com.android.server.wifi.SupplicantStaIfaceHal#getSignalPollResults}















     */













    @Deprecated















    @Nullable public SignalPollResult signalPoll(@NonNull String ifaceName) {















        IClientInterface iface = getClientInterface(ifaceName);















        if (iface == null) {