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

Commit e167cdf5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up OEM_PAID/PRIVATE APN type definitions" into main

parents d2afce38 6a685a7c

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

+2 −2
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ public class ApnSetting implements Parcelable { 
    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 = 1 << 16; // TODO(b/366194627): ApnTypes.OEM_PAID;

    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 = 1 << 17; // TODO(b/366194627): ApnTypes.OEM_PRIVATE;

    public static final int TYPE_OEM_PRIVATE = ApnTypes.OEM_PRIVATE;



    /** @hide */

    @IntDef(flag = true, prefix = {"TYPE_"}, value = {