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

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

Merge "Removed the hardcoded database column string"

parents beeeed25 322467ef

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9287,6 +9287,7 @@ package android.provider { 
    field public static final String DATA_CODING_SCHEME = "dcs";

    field public static final String DEFAULT_SORT_ORDER = "date DESC";

    field public static final String DELIVERY_TIME = "date";

    field public static final String ETWS_IS_PRIMARY = "etws_is_primary";

    field public static final String ETWS_WARNING_TYPE = "etws_warning_type";

    field public static final String GEOGRAPHICAL_SCOPE = "geo_scope";

    field public static final String GEOMETRIES = "geometries";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3334,6 +3334,7 @@ package android.provider { 
    field public static final String DATA_CODING_SCHEME = "dcs";

    field public static final String DEFAULT_SORT_ORDER = "date DESC";

    field public static final String DELIVERY_TIME = "date";

    field public static final String ETWS_IS_PRIMARY = "etws_is_primary";

    field public static final String ETWS_WARNING_TYPE = "etws_warning_type";

    field public static final String GEOGRAPHICAL_SCOPE = "geo_scope";

    field public static final String GEOMETRIES = "geometries";

core/java/android/provider/Telephony.java

+5 −3
Original line number Diff line number Diff line
@@ -4325,11 +4325,13 @@ public final class Telephony { 
        public static final String ETWS_WARNING_TYPE = "etws_warning_type";



        /**

         * ETWS (Earthquake and Tsunami Warning System) primary message or not (ETWS alerts only).

         * ETWS (Earthquake and Tsunami Warning System, Japan only) primary message or not. The

         * primary message is sent as soon as the emergency occurs. It does not provide any

         * information except the emergency type (e.g. earthquake, tsunami). The ETWS secondary

         * message is sent afterwards and provides the details of the emergency.

         *

         * <p>See {@link android.telephony.SmsCbEtwsInfo}</p>

         * <P>Type: BOOLEAN</P>

         *

         * @hide        // TODO: Unhide this for S.

         */

        public static final String ETWS_IS_PRIMARY = "etws_is_primary";

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8156,6 +8156,7 @@ package android.provider { 
    field public static final String DATA_CODING_SCHEME = "dcs";

    field public static final String DEFAULT_SORT_ORDER = "date DESC";

    field public static final String DELIVERY_TIME = "date";

    field public static final String ETWS_IS_PRIMARY = "etws_is_primary";

    field public static final String ETWS_WARNING_TYPE = "etws_warning_type";

    field public static final String GEOGRAPHICAL_SCOPE = "geo_scope";

    field public static final String GEOMETRIES = "geometries";