commit baf737ed7992ea6b3812d468056449f94515cd8c
author Ken Chen <cken@google.com> Tue May 03 13:33:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 03 13:33:08 2022 +0000
tree bf08cad580873c0e0b2b6200decbfb02c7218437
parent d7b8a1c1ff8dc877782dd4f055e78db1edce63a0
parent 96f0254477ebe33f0d8c95409d6ba9630b2f7f7c

Merge "Revert "Delete netd_aidl_interface-lateststable-cpp""

staticlibs/device/android/net/NetworkFactoryImpl.java

diff --git a/staticlibs/device/android/net/NetworkFactoryImpl.java b/staticlibs/device/android/net/NetworkFactoryImpl.java
index 439ea14..9c1190c 100644
--- a/staticlibs/device/android/net/NetworkFactoryImpl.java
+++ b/staticlibs/device/android/net/NetworkFactoryImpl.java
@@ -315,9 +315,8 @@
     }
 
     @Override public String toString() {
-        return "providerId="
-                + mProvider.getProviderId() + ", ScoreFilter="
-                + mScore + ", Filter=" + mCapabilityFilter + ", requests="
-                + mNetworkRequests.size();
+        return "providerId=" + (mProvider != null ? mProvider.getProviderId() : "null")
+                + ", ScoreFilter=" + mScore + ", Filter=" + mCapabilityFilter
+                + ", requests=" + mNetworkRequests.size();
     }
 }

staticlibs/device/android/net/NetworkFactoryLegacyImpl.java

diff --git a/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java b/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java
index 6dd0adb..6cba625 100644
--- a/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java
+++ b/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java
@@ -390,9 +390,8 @@
     }
 
     @Override public String toString() {
-        return "providerId="
-                + mProvider.getProviderId() + ", ScoreFilter="
-                + mScore + ", Filter=" + mCapabilityFilter + ", requests="
-                + mNetworkRequests.size();
+        return "providerId=" + (mProvider != null ? mProvider.getProviderId() : "null")
+                + ", ScoreFilter=" + mScore + ", Filter=" + mCapabilityFilter
+                + ", requests=" + mNetworkRequests.size();
     }
 }