phone1: Update to NOS2.6

Change-Id: Ic11ca4c49d204f0d887d2c46ebd668c3d5c2eb41 Signed-off-by: Omkar Chandorkar <[email protected]>
AOSPA · Jul 17, 2024 · 175037e · 175037e
1 parent 738a9a2
commit 175037e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/overlay/Phone1CarrierConfig/res/xml/vendor.xml b/overlay/Phone1CarrierConfig/res/xml/vendor.xml
@@ -4048,25 +4048,27 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="nt_hide_5g_standalone_bool" value="true" />
-        <int-array name="carrier_nr_availabilities_int_array" num="1">
-            <item value="1" />
-        </int-array>
         <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="nt_carrier_default_sa_enabled_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="2">
+            <item value="1" />
+            <item value="2" />
+        </int-array>
     </carrier_config>
     <carrier_config cid="765" name="GSM1800New World PCS Ltd.">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="nt_hide_5g_standalone_bool" value="true" />
-        <int-array name="carrier_nr_availabilities_int_array" num="1">
-            <item value="1" />
-        </int-array>
         <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="nt_carrier_default_sa_enabled_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="2">
+            <item value="1" />
+            <item value="2" />
+        </int-array>
     </carrier_config>
     <carrier_config cid="769" name="PCCW">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -4084,13 +4086,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="nt_hide_5g_standalone_bool" value="true" />
-        <int-array name="carrier_nr_availabilities_int_array" num="1">
-            <item value="1" />
-        </int-array>
         <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="hide_enhanced_4g_lte_bool" value="true" />
+        <boolean name="nt_carrier_default_sa_enabled_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="2">
+            <item value="1" />
+            <item value="2" />
+        </int-array>
     </carrier_config>
     <carrier_config cid="772" name="Public Mobile Networks/Reserved">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -4128,6 +4131,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <int name="call_barring_default_service_class_int" value="0" />
         <boolean name="config_hide_vt_callforward_option" value="false" />
         <long name="nt_delay_show_nw_monitor_fail_icon_timer_long" value="15000" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="849" name="Orange Jordan">
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
@@ -4376,6 +4380,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
         <boolean name="config_hide_vt_callforward_option" value="false" />
         <boolean name="vonr_enabled_bool" value="true" />
+        <string-array name="nt_mvno_string_array" num="1">
+            <item value="winSIM" />
+        </string-array>
     </carrier_config>
     <carrier_config cid="1456" name="o2">
         <boolean name="smsUsesSimpleCharactersOnly" value="true" />
@@ -4472,10 +4479,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="nt_hide_5g_standalone_bool" value="true" />
-        <int-array name="carrier_nr_availabilities_int_array" num="1">
-            <item value="1" />
-        </int-array>
         <boolean name="editable_wfc_mode_bool" value="false" />
         <int name="carrier_default_wfc_ims_mode_int" value="2" />
         <boolean name="hide_enhanced_4g_lte_bool" value="true" />
@@ -4486,6 +4489,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
             <item value="supl" />
         </string-array>
         <boolean name="nt_carrier_nsa_cell_cache_bool" value="false" />
+        <boolean name="nt_carrier_default_sa_enabled_bool" value="true" />
+        <int-array name="carrier_nr_availabilities_int_array" num="2">
+            <item value="1" />
+            <item value="2" />
+        </int-array>
     </carrier_config>
     <carrier_config cid="1529" name="Telemach">
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
@@ -4529,6 +4537,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="nt_carrier_change_to_auto_mode_bool" value="true" />
         <long name="nt_carrier_change_to_auto_mode_delay_timer_long" value="30000" />
         <long name="nt_delay_show_nw_monitor_fail_icon_timer_long" value="15000" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="1549" name="BSNL">
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
@@ -4773,6 +4782,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <int name="call_barring_default_service_class_int" value="0" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <boolean name="call_barring_visibility_bool" value="true" />
+        <boolean name="nt_carrier_default_smart_5g_enabled_bool" value="false" />
     </carrier_config>
     <carrier_config cid="1882" name="亞太電信 Asia Pacific Telecom">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -4868,6 +4878,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         </int-array>
         <long name="nt_delay_show_nw_monitor_fail_icon_timer_long" value="15000" />
         <boolean name="nt_show_5g_failed_notification_bool" value="true" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="1963" name="Vi">
         <boolean name="nt_carrier_change_to_auto_mode_bool" value="true" />
@@ -4876,6 +4887,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <long name="nt_delay_show_nw_monitor_fail_icon_timer_long" value="15000" />
         <boolean name="nt_show_5g_failed_notification_bool" value="true" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="1965" name="Telkom">
         <boolean name="call_forwarding_when_busy_supported_bool" value="false" />
@@ -4950,6 +4962,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
             <item value="NRCA" />
         </string-array>
         <boolean name="nt_show_5g_failed_notification_bool" value="true" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="2027" name="Airvoice">
         <string-array name="nt_5g_plus_display_rules_string_array" num="1">
@@ -5034,6 +5047,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     </carrier_config>
     <carrier_config cid="2106" name="IIJmio">
         <int name="call_waiting_service_class_int" value="0" />
+        <boolean name="carrier_vt_available_bool" value="false" />
     </carrier_config>
     <carrier_config cid="2109" name="Rakuten Mobile">
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
@@ -5195,6 +5209,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         <int name="lte_plus_threshold_bandwidth_khz_int" value="0" />
         <long name="nt_delay_show_nw_monitor_fail_icon_timer_long" value="15000" />
         <boolean name="nt_show_5g_failed_notification_bool" value="true" />
+        <string name="nt_lte_recovery_settings_string">1:15000</string>
     </carrier_config>
     <carrier_config cid="2385" name="Slovak Telekom">
         <boolean name="show_iccid_in_sim_status_bool" value="true" />
@@ -5374,6 +5389,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
     </carrier_config>
     <carrier_config cid="2407" name="OCN MOBILE ONE">
         <int name="call_waiting_service_class_int" value="0" />
+        <boolean name="carrier_vt_available_bool" value="false" />
     </carrier_config>
     <carrier_config cid="2419" name="EE Business">
         <int name="wfc_spn_format_idx_int" value="1" />

diff --git a/proprietary-files.txt b/proprietary-files.txt
@@ -944,7 +944,7 @@ vendor/etc/qcril_database/upgrade/config/10.0_config.sql
 vendor/etc/qcril_database/upgrade/config/11.0_config.sql
 vendor/etc/qcril_database/upgrade/config/12.0_config.sql
 vendor/etc/qcril_database/upgrade/config/13.0_config.sql
-vendor/etc/qcril_database/upgrade/config/16.0_config.sql
+vendor/etc/qcril_database/upgrade/config/17.0_config.sql
 vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql
@@ -961,6 +961,7 @@ vendor/etc/qcril_database/upgrade/other/12_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/14_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/15_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/16_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/17_version_update_ecc_table.sql
 vendor/etc/qcril_database/qcrilNr.db
 vendor/etc/seccomp_policy/[email protected]
 vendor/etc/telephony_packages.xml
@@ -1370,6 +1371,7 @@ vendor/etc/thermal.high.level1.conf
 vendor/etc/thermal.high.level2.conf
 vendor/etc/thermal.high.level3.conf
 vendor/etc/thermal.high.level4.conf
+vendor/etc/thermal.high.perf.conf
 vendor/etc/thermal.low.conf
 vendor/etc/thermal.low.level1.conf
 vendor/etc/thermal.low.level2.conf

diff --git a/system.prop b/system.prop
@@ -6,8 +6,8 @@ persist.vendor.btstack.enable.gatt_robust_caching=false
 persist.sys.brightness.low.gamma=true
 
 # Nothing Features
-ro.build.nothing.feature.base=0x120a040124b4247b9fffL
-ro.build.nothing.feature.diff.device.Spacewar=0x2a4041a032c34000
+ro.build.nothing.feature.base=0x8124a040124b4247b97ffL
+ro.build.nothing.feature.diff.device.Spacewar=0x2a4041a032c34800
 
 # Sensors
 persist.vendor.sensors.enable.mag_filter=true
diff --git a/vendor.prop b/vendor.prop
@@ -45,8 +45,8 @@ vendor.goodix.locked=0
 persist.vendor.fastrpc.hwid_version=PVT
 
 # Nothing Features
-ro.vendor.nothing.feature.base=0x124a040124b4247b9fffL
-ro.vendor.nothing.feature.diff.device.Spacewar=0x2a4041a032c34000
+ro.vendor.nothing.feature.base=0x8124a040124b4247b97ffL
+ro.vendor.nothing.feature.diff.device.Spacewar=0x2a4041a032c34800
 
 # qteeconnector settings
 persist.vendor.qteeconnector.retrying_interval=30