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

Merge "Handle null ApnSetting in PDCS"

Browse Source
This commit is contained in:
Sarah Chin
2022-03-18 21:47:16 +00:00
committed by Gerrit Code Review
parent f3ecc6182b ed693056e0
commit 600bc1f2ef
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

@@ -2009,10 +2009,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)