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

Commit 2ccb8d94 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update default for unset MTU v4" into tm-qpr-dev am: 26756ac2 

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



Change-Id: I779ea3f12a7940cde6b51bbaecdaa94e87ca8df4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85e287b6 26756ac2

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

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.ContentValues; 
import android.database.Cursor;

import android.hardware.radio.V1_5.ApnTypes;

import android.net.Uri;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.Telephony;
@@ -964,7 +963,7 @@ public class ApnSetting implements Parcelable { 
                ServiceState.convertBearerBitmaskToNetworkTypeBitmask(bearerBitmask);

        }

        int mtuV4 = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MTU_V4));

        if (mtuV4 == -1) {

        if (mtuV4 == UNSET_MTU) {

            mtuV4 = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MTU));

        }