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

Commit 9f69d224 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[RTT] Deprecate old feature availability APIs"

parents b8f83510 5c8614ea

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -29939,7 +29939,7 @@ package android.net.wifi { 
    method public java.util.List<android.net.wifi.ScanResult> getScanResults();

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

    method public int getWifiState();

    method public int getWifiState();

    method public boolean is5GHzBandSupported();

    method public boolean is5GHzBandSupported();

    method public boolean isDeviceToApRttSupported();

    method @Deprecated public boolean isDeviceToApRttSupported();

    method public boolean isEasyConnectSupported();

    method public boolean isEasyConnectSupported();

    method public boolean isEnhancedPowerReportingSupported();

    method public boolean isEnhancedPowerReportingSupported();

    method public boolean isOweSupported();

    method public boolean isOweSupported();

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4642,7 +4642,7 @@ package android.net.wifi { 
    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();

    method public boolean isDeviceToDeviceRttSupported();

    method @Deprecated public boolean isDeviceToDeviceRttSupported();

    method public boolean isPortableHotspotSupported();

    method public boolean isPortableHotspotSupported();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();

    method public boolean isWifiScannerSupported();

    method public boolean isWifiScannerSupported();

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -2136,17 +2136,26 @@ public class WifiManager { 
    }

    }





    /**

    /**

     * @deprecated Please use {@link android.content.pm.PackageManager#hasSystemFeature(String)}

     * with {@link android.content.pm.PackageManager#FEATURE_WIFI_RTT} and

     * {@link android.content.pm.PackageManager#FEATURE_WIFI_AWARE}.

     *

     * @return true if this adapter supports Device-to-device RTT

     * @return true if this adapter supports Device-to-device RTT

     * @hide

     * @hide

     */

     */

    @Deprecated

    @SystemApi

    @SystemApi

    public boolean isDeviceToDeviceRttSupported() {

    public boolean isDeviceToDeviceRttSupported() {

        return isFeatureSupported(WIFI_FEATURE_D2D_RTT);

        return isFeatureSupported(WIFI_FEATURE_D2D_RTT);

    }

    }





    /**

    /**

     * @deprecated Please use {@link android.content.pm.PackageManager#hasSystemFeature(String)}

     * with {@link android.content.pm.PackageManager#FEATURE_WIFI_RTT}.

     *

     * @return true if this adapter supports Device-to-AP RTT

     * @return true if this adapter supports Device-to-AP RTT

     */

     */

    @Deprecated

    public boolean isDeviceToApRttSupported() {

    public boolean isDeviceToApRttSupported() {

        return isFeatureSupported(WIFI_FEATURE_D2AP_RTT);

        return isFeatureSupported(WIFI_FEATURE_D2AP_RTT);

    }

    }