From 90427e32ca20bdc94c4210e1b9308f22e76668f6 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Wed, 10 Aug 2022 14:47:50 -0700
Subject: [PATCH] Update default for unset MTU v4

The default was added in ag/16276490 and partially reverted in
ag/17950114. Update the default the correct value of 0 instead of -1.

Test: atest ApnSettingTest
Bug: 237602273
Change-Id: I06d5b40d93d4a3bce441756615cccbd02e1822f5
---
 telephony/java/android/telephony/data/ApnSetting.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java
index 3ed87e1b9fe2c..f794a79713439 100644
--- a/telephony/java/android/telephony/data/ApnSetting.java
+++ b/telephony/java/android/telephony/data/ApnSetting.java
@@ -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));
         }