diff options
2 files changed, 22 insertions, 8 deletions
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java index ebda6f1c5826..4f5e0e48c793 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java @@ -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; diff --git a/wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java b/wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java index c6f67987746a..48ac82dc54a8 100644 --- a/wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java +++ b/wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java @@ -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); |