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

Commit 40c918b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add NonNull in Carriers constant"

parents 61500655 9f090e8a

api/current.txt

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

    field @Deprecated public static final String BEARER = "bearer";

    field public static final String CARRIER_ENABLED = "carrier_enabled";

    field public static final String CARRIER_ENABLED = "carrier_enabled";

    field public static final String CARRIER_ID = "carrier_id";

    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 CURRENT = "current";

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

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

    field @Deprecated public static final String MCC = "mcc";

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

    field public static final String PROXY = "proxy";

    field public static final String ROAMING_PROTOCOL = "roaming_protocol";

    field public static final String ROAMING_PROTOCOL = "roaming_protocol";

    field public static final String SERVER = "server";

    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 SUBSCRIPTION_ID = "sub_id";

    field public static final String TYPE = "type";

    field public static final String TYPE = "type";

    field public static final String USER = "user";

    field public static final String USER = "user";

telephony/java/android/provider/Telephony.java

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

         * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,

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

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

         */

         */

        @NonNull

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

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





        /**

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

         * {@link SubscriptionManager#getDefaultSubscriptionId()}. To specify subId for MSIM,

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

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

         */

         */

        @NonNull

        public static final Uri SIM_APN_URI = Uri.parse(

        public static final Uri SIM_APN_URI = Uri.parse(

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

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