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

Commit f7ef955d authored by David Su's avatar David Su
Browse files

WifiManager/Scanner: Expose @hide APIs as @SystemApi 

Expose @hide APIs in WifiManager/WifiScanner as
@SystemApi so that they can be referenced by external
callers (mostly Settings).

Bug: 143970861
Test: atest FrameworksWifiApiTests
Change-Id: I956290e2a3aca3f4946da52d7e271082824dd06c
parent f07dd9ac

api/system-current.txt

+54 −3
Original line number Diff line number Diff line
@@ -4839,21 +4839,38 @@ package android.net.wifi { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void connect(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void connect(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void disable(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK}) public void disableEphemeralNetwork(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void enableVerboseLogging(int);

    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);

    method @Nullable @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public String getCountryCode();

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.Network getCurrentNetwork();

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);

    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 public int getVerboseLoggingLevel();

    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 public boolean isApMacRandomizationSupported();

    method public boolean isConnectedMacRandomizationSupported();

    method @Deprecated public boolean isDeviceToDeviceRttSupported();

    method public boolean isDualBandSupported();

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean isDualModeSupported();

    method public boolean isPortableHotspotSupported();

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

    method public boolean isWifiScannerSupported();

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerSoftApCallback(@Nullable java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerSoftApCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerTrafficStateCallback(@NonNull android.net.wifi.WifiManager.TrafficStateCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerTrafficStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.TrafficStateCallback);

    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreBackupData(@NonNull byte[]);

    method @Deprecated @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreSupplicantBackupData(@NonNull byte[], @NonNull byte[]);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveBackupData();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void save(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission("android.permission.WIFI_SET_DEVICE_MOBILITY_STATE") public void setDeviceMobilityState(int);

    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
@@ -4865,8 +4882,15 @@ package android.net.wifi { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startSubscriptionProvisioning(@NonNull android.net.wifi.hotspot2.OsuProvider, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.hotspot2.ProvisioningCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void stopEasyConnectSession();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public boolean stopSoftAp();

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void unregisterNetworkRequestMatchCallback(@NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void unregisterSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void unregisterTrafficStateCallback(@NonNull android.net.wifi.WifiManager.TrafficStateCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void updateInterfaceIpState(@Nullable String, int);

    method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void updateWifiUsabilityScore(int, int, int);

    field public static final String ACTION_LINK_CONFIGURATION_CHANGED = "android.net.wifi.LINK_CONFIGURATION_CHANGED";

    field public static final String ACTION_PASSPOINT_LAUNCH_OSU_VIEW = "android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW";

    field public static final String ACTION_REQUEST_DISABLE = "android.net.wifi.action.REQUEST_DISABLE";

    field public static final String ACTION_REQUEST_ENABLE = "android.net.wifi.action.REQUEST_ENABLE";

    field public static final int CHANGE_REASON_ADDED = 0; // 0x0

    field public static final int CHANGE_REASON_CONFIG_CHANGE = 2; // 0x2

    field public static final int CHANGE_REASON_REMOVED = 1; // 0x1
@@ -4878,8 +4902,11 @@ package android.net.wifi { 
    field public static final int EASY_CONNECT_NETWORK_ROLE_AP = 1; // 0x1

    field public static final int EASY_CONNECT_NETWORK_ROLE_STA = 0; // 0x0

    field public static final String EXTRA_CHANGE_REASON = "changeReason";

    field public static final String EXTRA_LINK_PROPERTIES = "android.net.wifi.extra.LINK_PROPERTIES";

    field public static final String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";

    field public static final String EXTRA_OSU_NETWORK = "android.net.wifi.extra.OSU_NETWORK";

    field public static final String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";

    field public static final String EXTRA_URL = "android.net.wifi.extra.URL";

    field public static final String EXTRA_WIFI_AP_INTERFACE_NAME = "android.net.wifi.extra.WIFI_AP_INTERFACE_NAME";

    field public static final String EXTRA_WIFI_AP_MODE = "android.net.wifi.extra.WIFI_AP_MODE";

    field public static final String EXTRA_WIFI_AP_STATE = "wifi_state";
@@ -4892,6 +4919,8 @@ package android.net.wifi { 
    field public static final int IFACE_IP_MODE_UNSPECIFIED = -1; // 0xffffffff

    field public static final int PASSPOINT_HOME_NETWORK = 0; // 0x0

    field public static final int PASSPOINT_ROAMING_NETWORK = 1; // 0x1

    field public static final int SAP_START_FAILURE_GENERAL = 0; // 0x0

    field public static final int SAP_START_FAILURE_NO_CHANNEL = 1; // 0x1

    field public static final String WIFI_AP_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_AP_STATE_CHANGED";

    field public static final int WIFI_AP_STATE_DISABLED = 11; // 0xb

    field public static final int WIFI_AP_STATE_DISABLING = 10; // 0xa
@@ -4908,14 +4937,35 @@ package android.net.wifi { 
    method public void onSuccess();

  }













  public static interface WifiManager.NetworkRequestMatchCallback {













    method public default void onAbort();













    method public default void onMatch(@NonNull java.util.List<android.net.wifi.ScanResult>);













    method public default void onUserSelectionCallbackRegistration(@NonNull android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback);













    method public default void onUserSelectionConnectFailure(@NonNull android.net.wifi.WifiConfiguration);













    method public default void onUserSelectionConnectSuccess(@NonNull android.net.wifi.WifiConfiguration);













  }

























  public static interface WifiManager.NetworkRequestUserSelectionCallback {













    method public default void reject();













    method public default void select(@NonNull android.net.wifi.WifiConfiguration);













  }



























  public static interface WifiManager.OnWifiUsabilityStatsListener {















    method public void onWifiUsabilityStats(int, boolean, @NonNull android.net.wifi.WifiUsabilityStatsEntry);















  }





























  public static interface WifiManager.SoftApCallback {













    method public void onConnectedClientsChanged(@NonNull java.util.List<android.net.wifi.WifiClient>);













    method public default void onConnectedClientsChanged(@NonNull java.util.List<android.net.wifi.WifiClient>);















    method public default void onInfoChanged(@NonNull android.net.wifi.SoftApInfo);













    method public void onStateChanged(int, int);













    method public default void onStateChanged(int, int);













  }

























  public static interface WifiManager.TrafficStateCallback {













    method public void onStateChanged(int);













    field public static final int DATA_ACTIVITY_IN = 1; // 0x1













    field public static final int DATA_ACTIVITY_INOUT = 3; // 0x3













    field public static final int DATA_ACTIVITY_NONE = 0; // 0x0













    field public static final int DATA_ACTIVITY_OUT = 2; // 0x2















  }





























  public class WifiNetworkConnectionStatistics implements android.os.Parcelable {









@@ -4938,6 +4988,7 @@ package android.net.wifi {













    method @Deprecated public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);















    method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<java.lang.Integer> getAvailableChannels(int);















    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean getScanResults();













    method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<android.net.wifi.ScanResult> getSingleScanResults();















    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);















    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);















    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);

































api/system-lint-baseline.txt



+3
−1




























Original line number
Diff line number
Diff line















// Baseline format: 1.0















ActionValue: android.location.Location#EXTRA_NO_GPS_LOCATION:















    













ActionValue: android.net.wifi.WifiManager#ACTION_LINK_CONFIGURATION_CHANGED:













    Inconsistent action value; expected `android.net.wifi.action.LINK_CONFIGURATION_CHANGED`, was `android.net.wifi.LINK_CONFIGURATION_CHANGED`















































ArrayReturn: android.view.contentcapture.ViewNode#getAutofillOptions():

































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



+246
−119


























File changed.
Preview size limit exceeded, changes collapsed.
























wifi/java/android/net/wifi/WifiScanner.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -960,6 +960,9 @@ public class WifiScanner {













     * Retrieve the most recent scan results from a single scan request.















     * {@hide}















     */













    @NonNull













    @SystemApi













    @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)















    public List<ScanResult> getSingleScanResults() {















        validateChannel();















        Bundle scanParams = new Bundle();









@@ -973,7 +976,7 @@ public class WifiScanner {













        OperationResult result = (OperationResult) reply.obj;















        Log.e(TAG, "Error retrieving SingleScan results reason: " + result.reason















                + " description: " + result.description);













        return new ArrayList<ScanResult>();













        return new ArrayList<>();















    }































    private void startPnoScan(ScanSettings scanSettings, PnoSettings pnoSettings, int key) {

































wifi/tests/src/android/net/wifi/WifiManagerTest.java



+34
−14




























Original line number
Diff line number
Diff line








@@ -708,6 +708,18 @@ public class WifiManagerTest {













        }















    }





























    /**













     * Verify an IllegalArgumentException is thrown if executor is null.













     */













    @Test













    public void registerSoftApCallbackThrowsIllegalArgumentExceptionOnNullArgumentForExecutor() {













        try {













            mWifiManager.registerSoftApCallback(null, mSoftApCallback);













            fail("expected IllegalArgumentException");













        } catch (IllegalArgumentException expected) {













        }













    }





























    /**















     * Verify an IllegalArgumentException is thrown if callback is not provided.















     */









@@ -724,9 +736,10 @@ public class WifiManagerTest {













     * Verify main looper is used when handler is not provided.















     */















    @Test













    public void registerSoftApCallbackUsesMainLooperOnNullArgumentForHandler() {













        when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());













        mWifiManager.registerSoftApCallback(null, mSoftApCallback);













    public void registerSoftApCallbackUsesMainExecutorOnNoExecutorProvided() {













        when(mContext.getMainExecutor()).thenReturn(













                new HandlerExecutor(new Handler(mLooper.getLooper())));













        mWifiManager.registerSoftApCallback(mSoftApCallback);















        verify(mContext).getMainExecutor();















    }


























@@ -1147,10 +1160,11 @@ public class WifiManagerTest {













    @Test















    public void registerTrafficStateCallbackUsesMainLooperOnNullArgumentForHandler()















            throws Exception {













        when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());













        when(mContext.getMainExecutor()).thenReturn(













                new HandlerExecutor(new Handler(mLooper.getLooper())));















        ArgumentCaptor<ITrafficStateCallback.Stub> callbackCaptor =















                ArgumentCaptor.forClass(ITrafficStateCallback.Stub.class);













        mWifiManager.registerTrafficStateCallback(mTrafficStateCallback, null);













        mWifiManager.registerTrafficStateCallback(mTrafficStateCallback);















        verify(mWifiService).registerTrafficStateCallback(















                any(IBinder.class), callbackCaptor.capture(), anyInt());

























@@ -1166,7 +1180,8 @@ public class WifiManagerTest {













    @Test















    public void unregisterTrafficStateCallbackCallGoesToWifiServiceImpl() throws Exception {















        ArgumentCaptor<Integer> callbackIdentifier = ArgumentCaptor.forClass(Integer.class);













        mWifiManager.registerTrafficStateCallback(mTrafficStateCallback, mHandler);













        mWifiManager.registerTrafficStateCallback(new HandlerExecutor(mHandler),













                mTrafficStateCallback);















        verify(mWifiService).registerTrafficStateCallback(any(IBinder.class),















                any(ITrafficStateCallback.Stub.class), callbackIdentifier.capture());

























@@ -1182,7 +1197,8 @@ public class WifiManagerTest {













    public void trafficStateCallbackProxyCallsOnMultipleUpdates() throws Exception {















        ArgumentCaptor<ITrafficStateCallback.Stub> callbackCaptor =















                ArgumentCaptor.forClass(ITrafficStateCallback.Stub.class);













        mWifiManager.registerTrafficStateCallback(mTrafficStateCallback, mHandler);













        mWifiManager.registerTrafficStateCallback(new HandlerExecutor(mHandler),













                mTrafficStateCallback);















        verify(mWifiService).registerTrafficStateCallback(















                any(IBinder.class), callbackCaptor.capture(), anyInt());

























@@ -1201,7 +1217,7 @@ public class WifiManagerTest {













                TrafficStateCallback.DATA_ACTIVITY_OUT);















    }





























    /*













    /**















     * Verify client-provided callback is being called on the correct thread















     */















    @Test









@@ -1210,7 +1226,8 @@ public class WifiManagerTest {













                ArgumentCaptor.forClass(ITrafficStateCallback.Stub.class);















        TestLooper altLooper = new TestLooper();















        Handler altHandler = new Handler(altLooper.getLooper());













        mWifiManager.registerTrafficStateCallback(mTrafficStateCallback, altHandler);













        mWifiManager.registerTrafficStateCallback(new HandlerExecutor(altHandler),













                mTrafficStateCallback);















        verify(mContext, never()).getMainLooper();















        verify(mContext, never()).getMainExecutor();















        verify(mWifiService).registerTrafficStateCallback(









@@ -1228,10 +1245,11 @@ public class WifiManagerTest {













    @Test















    public void registerNetworkRequestMatchCallbackCallGoesToWifiServiceImpl()















            throws Exception {













        when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());













        when(mContext.getMainExecutor()).thenReturn(













                new HandlerExecutor(new Handler(mLooper.getLooper())));















        ArgumentCaptor<INetworkRequestMatchCallback.Stub> callbackCaptor =















                ArgumentCaptor.forClass(INetworkRequestMatchCallback.Stub.class);













        mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback, null);













        mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback);















        verify(mWifiService).registerNetworkRequestMatchCallback(















                any(IBinder.class), callbackCaptor.capture(), anyInt());


























@@ -1265,7 +1283,8 @@ public class WifiManagerTest {













    @Test















    public void unregisterNetworkRequestMatchCallbackCallGoesToWifiServiceImpl() throws Exception {















        ArgumentCaptor<Integer> callbackIdentifier = ArgumentCaptor.forClass(Integer.class);













        mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback, mHandler);













        mWifiManager.registerNetworkRequestMatchCallback(new HandlerExecutor(mHandler),













                mNetworkRequestMatchCallback);















        verify(mWifiService).registerNetworkRequestMatchCallback(















                any(IBinder.class), any(INetworkRequestMatchCallback.class),















                callbackIdentifier.capture());









@@ -1282,10 +1301,11 @@ public class WifiManagerTest {













    @Test















    public void networkRequestUserSelectionCallbackCallGoesToWifiServiceImpl()















            throws Exception {













        when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());













        when(mContext.getMainExecutor()).thenReturn(













                new HandlerExecutor(new Handler(mLooper.getLooper())));















        ArgumentCaptor<INetworkRequestMatchCallback.Stub> callbackCaptor =















                ArgumentCaptor.forClass(INetworkRequestMatchCallback.Stub.class);













        mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback, null);













        mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback);















        verify(mWifiService).registerNetworkRequestMatchCallback(















                any(IBinder.class), callbackCaptor.capture(), anyInt());