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

Commit a3de003a authored by Matt Walliser's avatar Matt Walliser Committed by Android (Google) Code Review
Browse files

Merge "Restore connecting state for hotspot network on service connected." into main

parents 425c25c0 48fb30e8

wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java

+2 −8
Original line number Diff line number Diff line
@@ -70,14 +70,8 @@ public abstract class SharedConnectivityService extends Service { 
    private List<HotspotNetwork> mHotspotNetworks = Collections.emptyList();

    private List<KnownNetwork> mKnownNetworks = Collections.emptyList();

    private SharedConnectivitySettingsState mSettingsState = null;

    private HotspotNetworkConnectionStatus mHotspotNetworkConnectionStatus =

            new HotspotNetworkConnectionStatus.Builder()

                    .setStatus(HotspotNetworkConnectionStatus.CONNECTION_STATUS_UNKNOWN)

                    .setExtras(Bundle.EMPTY).build();

    private KnownNetworkConnectionStatus mKnownNetworkConnectionStatus =

            new KnownNetworkConnectionStatus.Builder()

                    .setStatus(KnownNetworkConnectionStatus.CONNECTION_STATUS_UNKNOWN)

                    .setExtras(Bundle.EMPTY).build();

    private HotspotNetworkConnectionStatus mHotspotNetworkConnectionStatus = null;

    private KnownNetworkConnectionStatus mKnownNetworkConnectionStatus = null;

    // Used for testing

    private CountDownLatch mCountDownLatch;

wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java

+20 −0
Original line number Diff line number Diff line
@@ -394,6 +394,26 @@ public class SharedConnectivityServiceTest { 
        verify(mCallback, never()).onKnownNetworkConnectionStatusChanged(any());

    }



    @Test

    public void getHotspotNetworkConnectionStatus_withoutUpdate_returnsNull()

            throws RemoteException {

        SharedConnectivityService service = createService();

        ISharedConnectivityService.Stub binder =

                (ISharedConnectivityService.Stub) service.onBind(new Intent());



        assertThat(binder.getHotspotNetworkConnectionStatus()).isNull();

    }



    @Test

    public void getKnownNetworkConnectionStatus_withoutUpdate_returnsNull()

            throws RemoteException {

        SharedConnectivityService service = createService();

        ISharedConnectivityService.Stub binder =

                (ISharedConnectivityService.Stub) service.onBind(new Intent());



        assertThat(binder.getKnownNetworkConnectionStatus()).isNull();

    }



    private FakeSharedConnectivityService createService() {

        FakeSharedConnectivityService service = new FakeSharedConnectivityService();

        service.attachBaseContext(mContext);