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

Commit cd70c935 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Gerrit Code Review
Browse files

Merge changes from topic "CherryPickMainline" 

* changes:
  make sim_colors a system config
  convert hidden configs to public
  Add back off timer configs as carrier config
  Carrier config to switch data if primary is OOS
  Do not use hidden enabledSetting
  Do not use hidden putIntForUser
  Fix testNetworkScanRequestParcel_Parcel CTS
  Do not use hidden broadcast API of RemoteCallbackList
  Make requestModemActivityInfo a system api
  Remove usage of hidden Parcel APIs
  Do not use hidden withCleanCallingIdentity
  Do not use hidden isPrivilegedApp
parents bae34cb9 889aec24

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -44701,6 +44701,7 @@ package android.telephony { 
    field public static final String KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrp_thresholds_int_array";

    field public static final String KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrq_thresholds_int_array";

    field public static final String KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY = "5g_nr_sssinr_thresholds_int_array";

    field public static final String KEY_5G_WATCHDOG_TIME_MS_LONG = "5g_watchdog_time_long";

    field public static final String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";
@@ -44784,6 +44785,7 @@ package android.telephony { 
    field public static final String KEY_DATA_LIMIT_NOTIFICATION_BOOL = "data_limit_notification_bool";

    field public static final String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final String KEY_DATA_RAPID_NOTIFICATION_BOOL = "data_rapid_notification_bool";

    field public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG = "data_switch_validation_timeout_long";

    field public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL = "data_warning_notification_bool";

    field public static final String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";
@@ -44866,6 +44868,8 @@ package android.telephony { 
    field public static final String KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL = "only_auto_select_in_home_network";

    field public static final String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_BACKOFF_TIME_LONG = "opportunistic_network_backoff_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG = "opportunistic_network_data_switch_exit_hysteresis_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG = "opportunistic_network_data_switch_hysteresis_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG = "opportunistic_network_entry_or_exit_hysteresis_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_BANDWIDTH_INT = "opportunistic_network_entry_threshold_bandwidth_int";
@@ -44873,6 +44877,9 @@ package android.telephony { 
    field public static final String KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSSNR_INT = "opportunistic_network_entry_threshold_rssnr_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSRP_INT = "opportunistic_network_exit_threshold_rsrp_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_EXIT_THRESHOLD_RSSNR_INT = "opportunistic_network_exit_threshold_rssnr_int";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_MAX_BACKOFF_TIME_LONG = "opportunistic_network_max_backoff_time_long";

    field public static final String KEY_OPPORTUNISTIC_NETWORK_PING_PONG_TIME_LONG = "opportunistic_network_ping_pong_time_long";

    field public static final String KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL = "ping_test_before_data_switch_bool";

    field public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final String KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL = "prevent_clir_activation_and_deactivation_code_bool";

    field public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = "radio_restart_failure_causes_int_array";
@@ -44909,6 +44916,7 @@ package android.telephony { 
    field public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";

    field public static final String KEY_SUPPORT_TDSCDMA_BOOL = "support_tdscdma_bool";

    field public static final String KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY = "support_tdscdma_roaming_networks_string_array";

    field public static final String KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL = "switch_data_to_primary_if_primary_is_oos_bool";

    field public static final String KEY_TREAT_DOWNGRADED_VIDEO_CALLS_AS_VIDEO_CALLS_BOOL = "treat_downgraded_video_calls_as_video_calls_bool";

    field public static final String KEY_TTY_SUPPORTED_BOOL = "tty_supported_bool";

    field public static final String KEY_UNLOGGABLE_NUMBERS_STRING_ARRAY = "unloggable_numbers_string_array";

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ package android { 














  public static final class R.array {















    field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005













    field public static final int simColors = 17235974; // 0x1070006















  }





























  public static final class R.attr {










@@ -9556,6 +9557,7 @@ package android.telephony {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);















    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);













    method public void requestModemActivityInfo(@NonNull android.os.ResultReceiver);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetAllCarrierActions();















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetCarrierKeysForImsiEncryption();

























cmds/statsd/src/atoms.proto



+2
−1




























Original line number
Diff line number
Diff line








@@ -6237,7 +6237,8 @@ message DeviceIdentifierAccessDenied {













    optional bool is_preinstalled = 3;































    // True if the package is privileged.













    optional bool is_priv_app = 4;













    // Starting from Android 11, this boolean is not set and will always be false.













    optional bool is_priv_app = 4 [deprecated = true];















}































/**

































core/res/res/values/arrays.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -165,7 +165,7 @@













        <item>中文 (繁體)</item>















    </string-array>





























    <array name="sim_colors">













    <array name="simColors">















        <item>@color/Teal_700</item>















        <item>@color/Blue_700</item>















        <item>@color/Indigo_700</item>

































core/res/res/values/public.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -3021,6 +3021,10 @@













    <public-group type="color" first-id="0x0106001d">















    </public-group>





























    <public-group type="array" first-id="0x01070006">













      <!-- @hide @SystemApi -->













      <public name="simColors" />













    </public-group>















  <!-- ===============================================================















       DO NOT ADD UN-GROUPED ITEMS HERE