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

Handle null ApnSetting in PDCS

Browse Source 
ApnSetting is nullable in PDCS. TelephonyRegistry don't broadcast data
connection if ApnSetting is null.

Test: atest TelephonyRegistryTest
Bug: 221399355
Change-Id: I7a59d1d4bc6838b5032920e3a89b984336481562
This commit is contained in:
Sarah Chin
2022-03-08 11:48:20 -08:00
parent d24d842705
commit 87af38b1c3
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)