From ed693056e0b34617cfdc3df08881e18609993f6a Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Tue, 8 Mar 2022 11:48:20 -0800
Subject: [PATCH] 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
Merged-In: I7a59d1d4bc6838b5032920e3a89b984336481562
---
 services/core/java/com/android/server/TelephonyRegistry.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 811f2f5e5283d..382359ab1da56 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -2009,10 +2009,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)