Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52633050 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "linger" into tm-mainline-prod am: 70008b1e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17675459



Change-Id: I050c3c2fc2b9fbb91f7bb98aedf8a7b65201de76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8f62cb6 70008b1e

telephony/java/android/telephony/data/ApnSetting.java

+3 −1
Original line number Diff line number Diff line
@@ -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