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

Commit 322467ef authored by Jack Yu's avatar Jack Yu
Browse files

Removed the hardcoded database column string 

Made the ETWS isPrimary column name a system API

Bug: 157699377
Test: CtsTelephonyTestCases & CellBroadcastServiceTests
Change-Id: Ic4c78a12fb7e85328e6dea31b927f5f39420fbea
parent 3d6153d0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9282,6 +9282,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
@@ -3208,6 +3208,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";