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

Commit 5912215b authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag oem_paid_private" into main

parents 0113703b c230addd

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -48393,8 +48393,8 @@ package android.telephony.data { 
    field public static final int TYPE_IMS = 64; // 0x40

    field public static final int TYPE_MCX = 1024; // 0x400

    field public static final int TYPE_MMS = 2; // 0x2

    field @FlaggedApi("com.android.internal.telephony.flags.oem_paid_private") public static final int TYPE_OEM_PAID = 65536; // 0x10000

    field @FlaggedApi("com.android.internal.telephony.flags.oem_paid_private") public static final int TYPE_OEM_PRIVATE = 131072; // 0x20000

    field public static final int TYPE_OEM_PAID = 65536; // 0x10000

    field public static final int TYPE_OEM_PRIVATE = 131072; // 0x20000

    field public static final int TYPE_RCS = 32768; // 0x8000

    field public static final int TYPE_SUPL = 4; // 0x4

    field public static final int TYPE_VSIM = 4096; // 0x1000

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -16867,8 +16867,8 @@ package android.telephony.data { 
    field public static final String TYPE_IMS_STRING = "ims";

    field public static final String TYPE_MCX_STRING = "mcx";

    field public static final String TYPE_MMS_STRING = "mms";

    field @FlaggedApi("com.android.internal.telephony.flags.oem_paid_private") public static final String TYPE_OEM_PAID_STRING = "oem_paid";

    field @FlaggedApi("com.android.internal.telephony.flags.oem_paid_private") public static final String TYPE_OEM_PRIVATE_STRING = "oem_private";

    field public static final String TYPE_OEM_PAID_STRING = "oem_paid";

    field public static final String TYPE_OEM_PRIVATE_STRING = "oem_private";

    field public static final String TYPE_RCS_STRING = "rcs";

    field public static final String TYPE_SUPL_STRING = "supl";

    field public static final String TYPE_VSIM_STRING = "vsim";

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

+0 −6
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package android.telephony.data;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -37,7 +36,6 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.Log;



import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;
@@ -128,10 +126,8 @@ public class ApnSetting implements Parcelable { 
    /** APN type for RCS (Rich Communication Services). */

    public static final int TYPE_RCS = ApnTypes.RCS;

    /** APN type for OEM_PAID networks (Automotive PANS) */

    @FlaggedApi(Flags.FLAG_OEM_PAID_PRIVATE)

    public static final int TYPE_OEM_PAID = ApnTypes.OEM_PAID;

    /** APN type for OEM_PRIVATE networks (Automotive PANS) */

    @FlaggedApi(Flags.FLAG_OEM_PAID_PRIVATE)

    public static final int TYPE_OEM_PRIVATE = ApnTypes.OEM_PRIVATE;



    /** @hide */
@@ -388,7 +384,6 @@ public class ApnSetting implements Parcelable { 
     * modem components or carriers. Non-system apps should use the integer variants instead.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_OEM_PAID_PRIVATE)

    @SystemApi

    public static final String TYPE_OEM_PAID_STRING = "oem_paid";
@@ -399,7 +394,6 @@ public class ApnSetting implements Parcelable { 
     * modem components or carriers. Non-system apps should use the integer variants instead.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_OEM_PAID_PRIVATE)

    @SystemApi

    public static final String TYPE_OEM_PRIVATE_STRING = "oem_private";