Merge "Handle null ApnSetting in PDCS" into tm-dev am: 3c3c8a8bed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124746

Change-Id: I73aeed14cd358682e00b2dfb13a180d31cfc1aff
This commit is contained in:
TreeHugger Robot
2022-03-09 20:56:41 +00:00
committed by Automerger Merge Worker

View File

@@ -2013,10 +2013,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
return;
}
ApnSetting apnSetting = preciseState.getApnSetting();
synchronized (mRecords) {
if (validatePhoneId(phoneId)) {
if (validatePhoneId(phoneId) && preciseState.getApnSetting() != null) {
Pair<Integer, ApnSetting> key = Pair.create(preciseState.getTransportType(),
preciseState.getApnSetting());
PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)