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

Commit 8027ca9b authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topic "remove_dev_mode" 

* changes:
  Do not migrate use full volume shared preference
  support data migration from OEM legacy app to mainline
parents cab872d5 c3133cbc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44416,7 +44416,7 @@ package android.telephony { 
    field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

    field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";

    field public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";

    field public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field @Deprecated public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";

api/system-current.txt

+17 −0
Original line number Diff line number Diff line
@@ -6938,6 +6938,9 @@ package android.provider { 
  }















  public static final class Telephony.CellBroadcasts implements android.provider.BaseColumns {













    field @NonNull public static final String AUTHORITY_LEGACY = "cellbroadcast-legacy";













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













    field @NonNull public static final String CALL_METHOD_GET_PREFERENCE = "get_preference";















    field public static final String CID = "cid";















    field public static final String CMAS_CATEGORY = "cmas_category";















    field public static final String CMAS_CERTAINTY = "cmas_certainty";










@@ -6968,6 +6971,20 @@ package android.provider {













    field public static final String SUB_ID = "sub_id";















  }



























  public static final class Telephony.CellBroadcasts.Preference {













    field @NonNull public static final String ENABLE_ALERT_VIBRATION_PREF = "enable_alert_vibrate";













    field @NonNull public static final String ENABLE_AREA_UPDATE_INFO_PREF = "enable_area_update_info_alerts";













    field @NonNull public static final String ENABLE_CMAS_AMBER_PREF = "enable_cmas_amber_alerts";













    field @NonNull public static final String ENABLE_CMAS_EXTREME_THREAT_PREF = "enable_cmas_extreme_threat_alerts";













    field @NonNull public static final String ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF = "receive_cmas_in_second_language";













    field @NonNull public static final String ENABLE_CMAS_PRESIDENTIAL_PREF = "enable_cmas_presidential_alerts";













    field @NonNull public static final String ENABLE_CMAS_SEVERE_THREAT_PREF = "enable_cmas_severe_threat_alerts";













    field @NonNull public static final String ENABLE_EMERGENCY_PERF = "enable_emergency_alerts";













    field @NonNull public static final String ENABLE_PUBLIC_SAFETY_PREF = "enable_public_safety_messages";













    field @NonNull public static final String ENABLE_STATE_LOCAL_TEST_PREF = "enable_state_local_test_alerts";













    field @NonNull public static final String ENABLE_TEST_ALERT_PREF = "enable_test_alerts";













  }



























  public static final class Telephony.SimInfo {















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















  }

































core/java/android/provider/Telephony.java



+103
−0




























Original line number
Diff line number
Diff line








@@ -35,6 +35,7 @@ import android.database.Cursor;













import android.database.sqlite.SqliteWrapper;















import android.net.Uri;















import android.os.Build;













import android.os.Bundle;















import android.os.Parcel;















import android.telephony.Rlog;















import android.telephony.ServiceState;










@@ -4057,6 +4058,108 @@ public final class Telephony {













        @NonNull















        public static final Uri MESSAGE_HISTORY_URI = Uri.parse("content://cellbroadcasts/history");





























        /**













         * The authority for the legacy cellbroadcast provider.













         * This is used for OEM data migration. OEMs want to migrate message history or













         * sharepreference data to mainlined cellbroadcastreceiver app, should have a













         * contentprovider with authority: cellbroadcast-legacy. Mainlined cellbroadcastreceiver













         * will interact with this URI to retrieve data and persists to mainlined cellbroadcast app.













         *













         * @hide













         */













        @SystemApi













        public static final @NonNull String AUTHORITY_LEGACY = "cellbroadcast-legacy";



























        /**













         * A content:// style uri to the authority for the legacy cellbroadcast provider.













         * @hide













         */













        @SystemApi













        public static final @NonNull Uri AUTHORITY_LEGACY_URI =













                Uri.parse("content://cellbroadcast-legacy");



























        /**













         * Method name to {@link android.content.ContentProvider#call(String, String, Bundle)













         * for {@link #AUTHORITY_LEGACY}. Used to query cellbroadcast {@link Preference},













         * containing following supported entries













         * <ul>













         *     <li>{@link #ENABLE_AREA_UPDATE_INFO_PREF}</li>













         *     <li>{@link #ENABLE_TEST_ALERT_PREF}</li>













         *     <li>{@link #ENABLE_STATE_LOCAL_TEST_PREF}</li>













         *     <li>{@link #ENABLE_PUBLIC_SAFETY_PREF}</li>













         *     <li>{@link #ENABLE_CMAS_AMBER_PREF}</li>













         *     <li>{@link #ENABLE_CMAS_SEVERE_THREAT_PREF}</li>













         *     <li>{@link #ENABLE_CMAS_EXTREME_THREAT_PREF}</li>













         *     <li>{@link #ENABLE_CMAS_PRESIDENTIAL_PREF}</li>













         *     <li>{@link #ENABLE_ALERT_VIBRATION_PREF}</li>













         *     <li>{@link #ENABLE_EMERGENCY_PERF}</li>













         *     <li>{@link #ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF}</li>













         * </ul>













         * @hide













         */













        @SystemApi













        public static final @NonNull String CALL_METHOD_GET_PREFERENCE = "get_preference";



























        /**













         * Arg name to {@link android.content.ContentProvider#call(String, String, Bundle)}













         * for {@link #AUTHORITY_LEGACY}.













         * Contains all supported shared preferences for cellbroadcast.













         *













         * @hide













         */













        @SystemApi













        public static final class Preference {













            /**













             * Not Instantiatable.













             * @hide













             */













            private Preference() {}



























            /** Preference to enable area update info alert */













            public static final @NonNull String ENABLE_AREA_UPDATE_INFO_PREF =













                    "enable_area_update_info_alerts";



























            /** Preference to enable test alert */













            public static final @NonNull String ENABLE_TEST_ALERT_PREF =













                    "enable_test_alerts";



























            /** Preference to enable state local test alert */













            public static final @NonNull String ENABLE_STATE_LOCAL_TEST_PREF













                    = "enable_state_local_test_alerts";



























            /** Preference to enable public safety alert */













            public static final @NonNull String ENABLE_PUBLIC_SAFETY_PREF













                    = "enable_public_safety_messages";



























            /** Preference to enable amber alert */













            public static final @NonNull String ENABLE_CMAS_AMBER_PREF













                    = "enable_cmas_amber_alerts";



























            /** Preference to enable severe threat alert */













            public static final @NonNull String ENABLE_CMAS_SEVERE_THREAT_PREF













                    = "enable_cmas_severe_threat_alerts";



























            /** Preference to enable extreme threat alert */













            public static final @NonNull String ENABLE_CMAS_EXTREME_THREAT_PREF =













                    "enable_cmas_extreme_threat_alerts";



























            /** Preference to enable presidential alert */













            public static final @NonNull String ENABLE_CMAS_PRESIDENTIAL_PREF =













                    "enable_cmas_presidential_alerts";



























            /** Preference to enable alert vibration */













            public static final @NonNull String ENABLE_ALERT_VIBRATION_PREF =













                    "enable_alert_vibrate";



























            /** Preference to enable emergency alert */













            public static final @NonNull String ENABLE_EMERGENCY_PERF =













                    "enable_emergency_alerts";



























            /** Preference to enable receive alerts in second language */













            public static final @NonNull String ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF =













                    "receive_cmas_in_second_language";













        }





























        /**















         * The subscription which received this cell broadcast message.















         * <P>Type: INTEGER</P>

































telephony/java/android/telephony/CarrierConfigManager.java



+5
−2




























Original line number
Diff line number
Diff line








@@ -855,9 +855,12 @@ public class CarrierConfigManager {













            "carrier_force_disable_etws_cmas_test_bool";































    /**













     * The default flag specifying whether "Turn on Notifications" option will be always shown in













     * Settings->More->Emergency broadcasts menu regardless developer options is turned on or not.













     * The default flag specifying whether "Allow alerts" option will be always shown in













     * emergency alerts settings regardless developer options is turned on or not.













     *













     * @deprecated The allow alerts option is always shown now. No longer need a config for that.















     */













    @Deprecated















    public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL =















            "always_show_emergency_alert_onoff_bool";