diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-01 01:20:26 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-01 01:20:26 +0000 |
commit | db32ae65540bcc63dd89847c2e4cd24c7c6c0513 (patch) | |
tree | cd1307fa58b8f58ed944e68eccffbd8e63dc6225 | |
parent | 04a36b8eeed23a9ce08c4fc7a846de7d55697d92 (diff) | |
parent | df62b646fbbd7ed5982cbb56b6ffa994548e5e26 (diff) | |
download | Iwlan-db32ae65540bcc63dd89847c2e4cd24c7c6c0513.tar.gz |
Snap for 10422301 from df62b646fbbd7ed5982cbb56b6ffa994548e5e26 to udc-d1-release
Change-Id: I4c5e04b3177e286307176d747eea58103babdab5
-rw-r--r-- | src/com/google/android/iwlan/IwlanDataService.java | 4 | ||||
-rw-r--r-- | test/com/google/android/iwlan/IwlanDataServiceTest.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/google/android/iwlan/IwlanDataService.java b/src/com/google/android/iwlan/IwlanDataService.java index 0d564ab..04b6789 100644 --- a/src/com/google/android/iwlan/IwlanDataService.java +++ b/src/com/google/android/iwlan/IwlanDataService.java @@ -165,12 +165,12 @@ public class IwlanDataService extends DataService { @NonNull Network network, @NonNull LinkProperties linkProperties) { Log.d(TAG, "onLinkPropertiesChanged: " + linkProperties); - if (!sNetwork.equals(network)) { + if (!network.equals(sNetwork)) { Log.d(TAG, "Ignore LinkProperties changes for unused Network."); return; } - if (!sLinkProperties.equals(linkProperties)) { + if (!linkProperties.equals(sLinkProperties)) { for (IwlanDataServiceProvider dp : sIwlanDataServiceProviders.values()) { dp.dnsPrefetchCheck(); sLinkProperties = linkProperties; diff --git a/test/com/google/android/iwlan/IwlanDataServiceTest.java b/test/com/google/android/iwlan/IwlanDataServiceTest.java index c4549df..2f8f2c3 100644 --- a/test/com/google/android/iwlan/IwlanDataServiceTest.java +++ b/test/com/google/android/iwlan/IwlanDataServiceTest.java @@ -538,6 +538,8 @@ public class IwlanDataServiceTest { @Test public void testOnCrossSimCallingEnable_doNotUpdateTunnelManagerIfNoNetwork() throws Exception { when(mMockImsMmTelManager.isCrossSimCallingEnabled()).thenReturn(true); + onSystemDefaultNetworkLost(); + mIwlanDataService .mIwlanDataServiceHandler .obtainMessage( |