commit 4caf33799111feafcff85d3ad6dcf34933d1c04c
author Motomu Utsumi <motomuman@google.com> Wed Apr 27 09:10:41 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Wed Apr 27 11:25:11 2022 +0000
tree f103424d3d4503cfa0b1cd664811eda2e565b670
parent 92c4d6b1cc10fd9728b02539a439c5270e11830a

Add null check for mProvider

mProvider is null before register is called.
But toString call mProvider.getProviderId() without null check
and caused NullPointerException.
This commit add null check and fix this issue.

Bug: 228796405
Test: m
Change-Id: Ic8e23b21d11705219f1a8fddd544941fbddb183e

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();
     }
 }