From c29f0720f0e2948e1700190942e2fb0d57c1967a Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Sat, 9 Apr 2022 13:20:22 -0700
Subject: [PATCH] Fixed lingering network bitmask not set issue

If lingering network bitmask is not set, we should
fallback to the network type bitmask.

Fix: 223159318
Test: atest DataNetworkControllerTest & manual
Change-Id: Iacfb84e57104cd12665ab4fb4e388f4876fdfcea
---
 telephony/java/android/telephony/data/ApnSetting.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index e97342b1bb568..c56cc62abe447 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -1576,7 +1576,9 @@ public class ApnSetting implements Parcelable {
      * @hide
      */
     public boolean canSupportLingeringNetworkType(@NetworkType int networkType) {
-        if (networkType == 0) {
+        // For backwards compatibility, if this field is not set, we just use the existing
+        // network type bitmask.
+        if (mLingeringNetworkTypeBitmask == 0) {
             return canSupportNetworkType(networkType);
         }
         // Do a special checking for GSM. In reality, GSM is a voice only network type and can never