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

Commit 7b8e6351 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Automerger Merge Worker
Browse files

Merge "Fix getters to return null on failure." into udc-dev am: 3fd4802d am: 6a25d02e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21888727



Change-Id: I16fffbd1d55c099e2ebe3bce0526efb8165ada12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1803298 6a25d02e

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10130,9 +10130,9 @@ package android.net.wifi.sharedconnectivity.app { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean disconnectHotspotNetwork(@NonNull android.net.wifi.sharedconnectivity.app.HotspotNetwork);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean forgetKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.HotspotNetworkConnectionStatus getHotspotNetworkConnectionStatus();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.HotspotNetwork> getHotspotNetworks();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.HotspotNetwork> getHotspotNetworks();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus getKnownNetworkConnectionStatus();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.KnownNetwork> getKnownNetworks();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.sharedconnectivity.app.KnownNetwork> getKnownNetworks();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState getSettingsState();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivityClientCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean unregisterCallback(@NonNull android.net.wifi.sharedconnectivity.app.SharedConnectivityClientCallback);

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java

+10 −8
Original line number Diff line number Diff line
@@ -434,14 +434,15 @@ public class SharedConnectivityManager { 
    /**

     * Gets the list of hotspot networks the user can select to connect to.

     *

     * @return Returns a {@link List} of {@link HotspotNetwork} objects, empty list on failure.

     * @return Returns a {@link List} of {@link HotspotNetwork} objects, null on failure.

     */

    @RequiresPermission(anyOf = {android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD})

    @NonNull

    @SuppressWarnings("NullableCollection")

    @Nullable

    public List<HotspotNetwork> getHotspotNetworks() {

        if (mService == null) {

            return List.of();

            return null;

        }



        try {
@@ -449,20 +450,21 @@ public class SharedConnectivityManager { 
        } catch (RemoteException e) {

            Log.e(TAG, "Exception in getHotspotNetworks", e);

        }

        return List.of();

        return null;

    }



    /**

     * Gets the list of known networks the user can select to connect to.

     *

     * @return Returns a {@link List} of {@link KnownNetwork} objects, empty list on failure.

     * @return Returns a {@link List} of {@link KnownNetwork} objects, null on failure.

     */

    @RequiresPermission(anyOf = {android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD})

    @NonNull

    @SuppressWarnings("NullableCollection")

    @Nullable

    public List<KnownNetwork> getKnownNetworks() {

        if (mService == null) {

            return List.of();

            return null;

        }



        try {
@@ -470,7 +472,7 @@ public class SharedConnectivityManager { 
        } catch (RemoteException e) {

            Log.e(TAG, "Exception in getKnownNetworks", e);

        }

        return List.of();

        return null;

    }



    /**

wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java

+8 −8
Original line number Diff line number Diff line
@@ -423,20 +423,20 @@ public class SharedConnectivityManagerTest { 
     * Verify getters.

     */

    @Test

    public void getHotspotNetworks_serviceNotConnected_shouldReturnEmptyList() {

    public void getHotspotNetworks_serviceNotConnected_shouldReturnNull() {

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);

        manager.setService(null);



        assertThat(manager.getKnownNetworks()).isEmpty();

        assertThat(manager.getHotspotNetworks()).isNull();

    }



    @Test

    public void getHotspotNetworks_remoteException_shouldReturnEmptyList() throws RemoteException {

    public void getHotspotNetworks_remoteException_shouldReturnNull() throws RemoteException {

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);

        manager.setService(mService);

        doThrow(new RemoteException()).when(mService).getHotspotNetworks();



        assertThat(manager.getKnownNetworks()).isEmpty();

        assertThat(manager.getHotspotNetworks()).isNull();

    }



    @Test
@@ -450,21 +450,21 @@ public class SharedConnectivityManagerTest { 
    }



    @Test

    public void getKnownNetworks_serviceNotConnected_shouldReturnEmptyList()

    public void getKnownNetworks_serviceNotConnected_shouldReturnNull()

            throws RemoteException {

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);

        manager.setService(null);



        assertThat(manager.getKnownNetworks()).isEmpty();

        assertThat(manager.getKnownNetworks()).isNull();

    }



    @Test

    public void getKnownNetworks_remoteException_shouldReturnEmptyList() throws RemoteException {

    public void getKnownNetworks_remoteException_shouldReturnNull() throws RemoteException {

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);

        manager.setService(mService);

        doThrow(new RemoteException()).when(mService).getKnownNetworks();



        assertThat(manager.getKnownNetworks()).isEmpty();

        assertThat(manager.getKnownNetworks()).isNull();

    }



    @Test