Merge "Handle null ApnSetting in PDCS" into tm-dev

This commit is contained in:
TreeHugger Robot
2022-03-09 20:34:31 +00:00
committed by Android (Google) Code Review

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)