From 4caf33799111feafcff85d3ad6dcf34933d1c04c Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Wed, 27 Apr 2022 09:10:41 +0000 Subject: [PATCH] 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 | 7 +++---- .../device/android/net/NetworkFactoryLegacyImpl.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/staticlibs/device/android/net/NetworkFactoryImpl.java b/staticlibs/device/android/net/NetworkFactoryImpl.java index 439ea1421a..9c1190c219 100644 --- a/staticlibs/device/android/net/NetworkFactoryImpl.java +++ b/staticlibs/device/android/net/NetworkFactoryImpl.java @@ -315,9 +315,8 @@ class NetworkFactoryImpl extends NetworkFactoryLegacyImpl { } @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(); } } diff --git a/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java b/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java index 6dd0adb0c9..6cba625888 100644 --- a/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java +++ b/staticlibs/device/android/net/NetworkFactoryLegacyImpl.java @@ -390,9 +390,8 @@ class NetworkFactoryLegacyImpl extends Handler } @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(); } }