summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sarah Chin <sarahchin@google.com> 2022-03-08 11:48:20 -0800
committer Sarah Chin <sarahchin@google.com> 2022-03-08 13:34:17 -0800
commit87af38b1c385d8a6e7bb441734e8e5f129124f7d (patch)
tree3a60f7258aa77c50998c1f33520400dd8f52a459
parentd24d842705b1d1436fe8914cb055bf81cf78cf90 (diff)
Handle null ApnSetting in PDCS
ApnSetting is nullable in PDCS. TelephonyRegistry don't broadcast data connection if ApnSetting is null. Test: atest TelephonyRegistryTest Bug: 221399355 Change-Id: I7a59d1d4bc6838b5032920e3a89b984336481562
-rw-r--r--services/core/java/com/android/server/TelephonyRegistry.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 40ab0c07d166..58fa9fb28a78 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -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)