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

Commit 28f2ead8 authored by Calvin Pan's avatar Calvin Pan Committed by android-build-merger
Browse files

Merge "Add NonNull in Carriers constant" into qt-dev am: c6a1bf1a 

am: d0ad497e

Change-Id: I428ff623d46d3891b05882df5774343bfe3234c0
parents 3c3ff754 d0ad497e

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -39096,7 +39096,7 @@ package android.provider { 
    field @Deprecated public static final String BEARER = "bearer";

    field public static final String CARRIER_ENABLED = "carrier_enabled";

    field public static final String CARRIER_ID = "carrier_id";

    field public static final android.net.Uri CONTENT_URI;

    field @NonNull public static final android.net.Uri CONTENT_URI;

    field public static final String CURRENT = "current";

    field public static final String DEFAULT_SORT_ORDER = "name ASC";

    field @Deprecated public static final String MCC = "mcc";
@@ -39115,7 +39115,7 @@ package android.provider { 
    field public static final String PROXY = "proxy";

    field public static final String ROAMING_PROTOCOL = "roaming_protocol";

    field public static final String SERVER = "server";

    field public static final android.net.Uri SIM_APN_URI;

    field @NonNull public static final android.net.Uri SIM_APN_URI;

    field public static final String SUBSCRIPTION_ID = "sub_id";

    field public static final String TYPE = "type";

    field public static final String USER = "user";

telephony/java/android/provider/Telephony.java

+2 −0
Original line number Diff line number Diff line
@@ -3394,6 +3394,7 @@ public final class Telephony { 
         * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,

         * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id.

         */

        @NonNull

        public static final Uri CONTENT_URI = Uri.parse("content://telephony/carriers");



        /**
@@ -3406,6 +3407,7 @@ public final class Telephony { 
         * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,

         * use {@link Uri#withAppendedPath(Uri, String)} to append with subscription id.

         */

        @NonNull

        public static final Uri SIM_APN_URI = Uri.parse(

                "content://telephony/carriers/sim_apn_list");