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

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

Merge "WifiManager.calculateSignalLevel(): add @IntRange"

parents 21460c4e a4048219

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -31094,7 +31094,7 @@ package android.net.wifi { 
    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public void addSuggestionConnectionStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);

    method @Deprecated public static int calculateSignalLevel(int, int);

    method public int calculateSignalLevel(int);

    method @IntRange(from=0) public int calculateSignalLevel(int);

    method @Deprecated public void cancelWps(android.net.wifi.WifiManager.WpsCallback);

    method public static int compareSignalLevel(int, int);

    method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(String);
@@ -31107,7 +31107,7 @@ package android.net.wifi { 
    method public android.net.wifi.WifiInfo getConnectionInfo();

    method public android.net.DhcpInfo getDhcpInfo();

    method public int getMaxNumberOfNetworkSuggestionsPerApp();

    method public int getMaxSignalLevel();

    method @IntRange(from=0) public int getMaxSignalLevel();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiNetworkSuggestion> getNetworkSuggestions();

    method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_SETUP_WIZARD"}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();

    method public java.util.List<android.net.wifi.ScanResult> getScanResults();

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

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.Manifest.permission.READ_WIFI_CREDENTIAL; 


import android.annotation.CallbackExecutor;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -2905,6 +2906,7 @@ public class WifiManager { 
     * [0, {@link #getMaxSignalLevel()}], where 0 is the lowest (worst signal) RSSI

     * rating and {@link #getMaxSignalLevel()} is the highest (best signal) RSSI rating.

     */

    @IntRange(from = 0)

    public int calculateSignalLevel(int rssi) {

        try {

            return mService.calculateSignalLevel(rssi);
@@ -2917,6 +2919,7 @@ public class WifiManager { 
     * Get the system default maximum signal level.

     * This is the maximum RSSI level returned by {@link #calculateSignalLevel(int)}.

     */

    @IntRange(from = 0)

    public int getMaxSignalLevel() {

        return calculateSignalLevel(Integer.MAX_VALUE);

    }