Avoid NPE for null static LinkProperties object

- LinkProperties can be null at onCapabilitiesChanged().
- Reverse equality check to access @NonNull variable first.
- Update static variable 'sNetworkConnected' to fix flaky test.

Fix: 288475484, 287627889
Test: IwlanDataServiceTest, Live regression test.

Change-Id: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f

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(