Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-09 20:34:31 +00:00
committed by Android (Google) Code Review
parent 04248bddc3 87af38b1c3
commit 3c3c8a8bed
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/TelephonyRegistry.java
View File

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