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

Commit f8d769ef authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topics "system_api_setup_wizard", "deprecate_apis" 

* changes:
  WifiManager: Mark all settings/setupwizard custom APIs @SystemApi
  WifiManager: Deprecate API implementation
parents c489b375 29c2a95a

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -3679,6 +3679,10 @@ package android.net.wifi { 


  public class WifiManager {

    method public void connect(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);

    method public void connect(int, android.net.wifi.WifiManager.ActionListener);

    method public void disable(int, android.net.wifi.WifiManager.ActionListener);

    method public void disableEphemeralNetwork(java.lang.String);

    method public void forget(int, android.net.wifi.WifiManager.ActionListener);

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

    method public java.util.List<android.net.wifi.hotspot2.OsuProvider> getMatchingOsuProviders(java.util.List<android.net.wifi.ScanResult>);

    method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
@@ -3690,6 +3694,7 @@ package android.net.wifi { 
    method public boolean isWifiApEnabled();

    method public boolean isWifiScannerSupported();

    method public void registerNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback, android.os.Handler);

    method public void save(android.net.wifi.WifiConfiguration, android.net.wifi.WifiManager.ActionListener);

    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);

    method public boolean startScan(android.os.WorkSource);

    method public void unregisterNetworkRequestMatchCallback(android.net.wifi.WifiManager.NetworkRequestMatchCallback);

wifi/java/android/net/wifi/IWifiManager.aidl

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ interface IWifiManager 
     */

    oneway void requestActivityInfo(in ResultReceiver result);



    ParceledListSlice getConfiguredNetworks();

    ParceledListSlice getConfiguredNetworks(String packageName);



    ParceledListSlice getPrivilegedConfiguredNetworks();
@@ -90,11 +90,11 @@ interface IWifiManager 


    List<ScanResult> getScanResults(String callingPackage);



    void disconnect(String packageName);

    boolean disconnect(String packageName);



    void reconnect(String packageName);

    boolean reconnect(String packageName);



    void reassociate(String packageName);

    boolean reassociate(String packageName);



    WifiInfo getConnectionInfo(String callingPackage);

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

+41 −13
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ public class WifiManager { 
    public List<WifiConfiguration> getConfiguredNetworks() {

        try {

            ParceledListSlice<WifiConfiguration> parceledList =

                mService.getConfiguredNetworks();

                    mService.getConfiguredNetworks(mContext.getOpPackageName());

            if (parceledList == null) {

                return Collections.emptyList();

            }
@@ -1761,8 +1761,7 @@ public class WifiManager { 
    @Deprecated

    public boolean disconnect() {

        try {

            mService.disconnect(mContext.getOpPackageName());

            return true;

            return mService.disconnect(mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1786,8 +1785,7 @@ public class WifiManager { 
    @Deprecated

    public boolean reconnect() {

        try {

            mService.reconnect(mContext.getOpPackageName());

            return true;

            return mService.reconnect(mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1811,8 +1809,7 @@ public class WifiManager { 
    @Deprecated

    public boolean reassociate() {

        try {

            mService.reassociate(mContext.getOpPackageName());

            return true;

            return mService.reassociate(mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2132,14 +2129,14 @@ public class WifiManager { 
     * existing networks. You should assume the network IDs can be different

     * after calling this method.

     *

     * @return {@code false} Will always return true.

     * @return {@code false}.

     * @deprecated There is no need to call this method -

     * {@link #addNetwork(WifiConfiguration)}, {@link #updateNetwork(WifiConfiguration)}

     * and {@link #removeNetwork(int)} already persist the configurations automatically.

     */

    @Deprecated

    public boolean saveConfiguration() {

        return true;

        return false;

    }



    /**
@@ -3406,6 +3403,11 @@ public class WifiManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    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
@@ -3426,7 +3428,12 @@ public class WifiManager { 
     * initialized again

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    public void connect(int networkId, ActionListener listener) {

        if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative");

        getChannel().sendMessage(CONNECT_NETWORK, networkId, putListener(listener));
@@ -3452,7 +3459,12 @@ public class WifiManager { 
     * initialized again

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    public void save(WifiConfiguration config, ActionListener listener) {

        if (config == null) throw new IllegalArgumentException("config cannot be null");

        getChannel().sendMessage(SAVE_NETWORK, 0, putListener(listener), config);
@@ -3471,7 +3483,12 @@ public class WifiManager { 
     * initialized again

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    public void forget(int netId, ActionListener listener) {

        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");

        getChannel().sendMessage(FORGET_NETWORK, netId, putListener(listener));
@@ -3486,7 +3503,12 @@ public class WifiManager { 
     * initialized again

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    public void disable(int netId, ActionListener listener) {

        if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");

        getChannel().sendMessage(DISABLE_NETWORK, netId, putListener(listener));
@@ -3498,6 +3520,12 @@ public class WifiManager { 
     * @param SSID, in the format of WifiConfiguration's SSID.

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK

    })

    public void disableEphemeralNetwork(String SSID) {

        if (SSID == null) throw new IllegalArgumentException("SSID cannot be null");

        try {

wifi/java/com/android/server/wifi/AbstractWifiService.java

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public abstract class AbstractWifiService extends IWifiManager.Stub { 
    }



    @Override

    public ParceledListSlice getConfiguredNetworks() {

    public ParceledListSlice getConfiguredNetworks(String packageName) {

        throw new UnsupportedOperationException();

    }
@@ -188,17 +188,17 @@ public abstract class AbstractWifiService extends IWifiManager.Stub { 
    }



    @Override

    public void disconnect(String packageName) {

    public boolean disconnect(String packageName) {

        throw new UnsupportedOperationException();

    }



    @Override

    public void reconnect(String packageName) {

    public boolean reconnect(String packageName) {

        throw new UnsupportedOperationException();

    }



    @Override

    public void reassociate(String packageName) {

    public boolean reassociate(String packageName) {

        throw new UnsupportedOperationException();

    }