joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add null check for mProvider

Browse source 
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
This commit is contained in:
Motomu Utsumi 2022-04-27 09:10:41 +00:00
commit 4caf337991
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
staticlibs/device/android/net/NetworkFactoryImpl.java
View file

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

7
staticlibs/device/android/net/NetworkFactoryLegacyImpl.java
View file

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