Merge "Handle null ApnSetting in PDCS"

2022-03-18 21:47:16 +00:00
parent f3ecc6182b ed693056e0
commit 600bc1f2ef
1 changed files with 1 additions and 3 deletions
--- 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)