Commit Graph

3488 Commits

Author SHA1 Message Date
Xin Li
10d930d1cf Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
Bug: 385190204
Merged-In: I04f90b42907d07c6111a7b41a531f7717df33672
Change-Id: I58e92a6e45193de820f7432dcb365c41c14d3141
2025-03-06 12:22:41 -08:00
Xin Li
5bfde9fbf5 Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
tom hsu
58f40ebc7b Fix crash due to display name is not set to View.
Flag: EXEMPT bug fix
Fix: b/396700275
Fix: b/396606595
Test: manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:04006ccb4867a17e7e59c64327d102e9b30af5f9)
Merged-In: I2a70c4e31c182f99cc4fb3da93ce7911da005429
Change-Id: I2a70c4e31c182f99cc4fb3da93ce7911da005429
2025-02-19 19:18:06 -08:00
pengfeix
4fa2836aa5 Fix popping up the the VoLTE screen when it's disabled by the carrier.
- If only has the default carrier config just return, to
  avoid popping up the the VoLTE screen when it's disabled
  by the carrier.

Bug: 332647055
Test: manual
Flag: NONE bugfix
Change-Id: I71bc02f5044535d48726a531e36d57df73bc0f5f
2025-02-10 08:23:23 +05:30
tom hsu
d9b78ebc97 Fix crash due to over limited length.
Flag: EXEMPT bug fix
Fix: b/388404115
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a66f9dc3629586c3543952566f05f1b720dfa50c)
Merged-In: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
Change-Id: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
2025-02-05 23:55:33 -08:00
Aishwarya Mallampati
6df5cb0bc4 Do not show satellite messaging in sim settings if sms is not supported
Bug: 393181741
Test: 393186308
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d7769ad1805aaf53d22feeeca5d0b766bc202f54)
Merged-In: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715
Change-Id: I1cb1d22541ba68ce20a0fd9319ddb2d5fc5d6715
2025-01-30 10:44:48 -08:00
tomhsu
10970ad6be NTN connected type is manual, UI status shall be checked by callback.
- Manual type shall check with onCarrierRoamingNtnAvailableServicesChanged
 - Automatic type check shall check with getAttachRestrictionReasonsForCarrier

Flag: EXEMPT bug fix
Fix: b/387523217
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a0a7610cf1a68a1215a5a89c971c65200d421b)
Merged-In: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
Change-Id: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
2025-01-07 17:30:35 -08:00
SongFerng Wang
51769c2ed4 Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main 2024-12-19 02:56:12 -08:00
Treehugger Robot
7307f34866 Merge "Update the OWNERs" into main am: 5655b46dee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3412198

Change-Id: I508a2b6d6aab099c9cc95a06c89c01545df6e197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-12 23:38:24 -08:00
Tom Hsu
c3b8b7a21d Update the OWNERs
Change-Id: Iee6e33e04d232b78bf2d2064687a2d434b4f78c0
Flag: EXEMPT only changing OWNERS
Fix: b/383913940 
Test: make pass
2024-12-12 22:33:46 -08:00
Qiang Chen
f00508c4b5 Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE
This NPE can be found in MTBF stress testing

Bug: 290855314
Test: Manaul

Change-Id: I03aaa6618255638a485f32e1bab34c6fa71945e4
2024-12-11 13:24:33 +05:30
Jacky Wang
d989dc5c36 [Catalyst] Refine WifiHotspotSwitchPreference
NO_IFTTT=Catalyst only

Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Test: devtool
Change-Id: Ica09fe05cc4d30e1f55b4bd91996425ef951abf7
2024-12-09 12:44:59 +08:00
Jacky Wang
7ca56d493a [Catalyst] Avoid creating new KeyValueStore for AirplaneModePreference
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: atest
Change-Id: I1cffcc68358f36d36e14cde5997907816ebe08a4
2024-12-09 07:31:51 +08:00
Jacky Wang
dc1a52a2ee [Catalyst] Simplify KeyValueStore API calls
NO_IFTTT=Catalyst only

Bug: 325144964
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: I518b9c861eac6d515dfc7f0ac2d028f9395e06a1
2024-12-08 19:22:18 +08:00
Treehugger Robot
ce86140b85 Merge "[Catalyst] Migrate Wi-Fi Hotspot preference" into main 2024-12-07 03:01:30 +00:00
Treehugger Robot
50a43ea47a Merge "Improve satellite category visiblity logic." into main 2024-12-06 16:43:13 +00:00
Treehugger Robot
a543a5791b Merge "[Catalyst] Make AirplaneModePreference final" into main 2024-12-06 16:18:54 +00:00
tomhsu
ef835bb57d Improve satellite category visiblity logic.
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: manual test
Change-Id: If5df345a631006e7efc41471b6cd6419ca4b3d79
2024-12-06 14:47:47 +00:00
Jacky Wang
858fbdb759 [Catalyst] Make AirplaneModePreference final
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: TEST_ONLY
Test: atest
Change-Id: Ieea0e0e770d93d8bbe6f1f7a608541d5ba42c9cc
2024-12-06 22:20:37 +08:00
Treehugger Robot
c6636f9a25 Merge "Add a method to get controllers with same parent class type." into main 2024-12-06 13:58:49 +00:00
tomhsu
63469da6f6 Remove Satellite SOS entry from AOSP
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: Manual test
Change-Id: If47081be0ed0734be841b2fe9129d22a76ed8e1b
2024-12-06 11:57:15 +00:00
Treehugger Robot
3859a8adaa Merge "[Catalyst] Migrate BluetoothTetherSwitchPreference." into main 2024-12-06 11:10:52 +00:00
Weng Su
6fb75678e5 [Catalyst] Migrate Wi-Fi Hotspot preference
Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Test: Manual testing
atest -c TetherSettingsTest \
         TetherScreenTest

Change-Id: I89d418454af7887a4892c616f4efff481b536a91
2024-12-06 10:47:37 +00:00
tomhsu
253cb874d8 Add a method to get controllers with same parent class type.
Flag: EXEMPT bug fix
Fix: b/382635197
Test: Manual test.
Change-Id: I0a48628d032d7ce1f47cbca20e63b20149b5daa0
2024-12-06 10:37:34 +00:00
Yuchen
9f10978d0c [Catalyst] Migrate BluetoothTetherSwitchPreference.
Bug: 368355361
Flag: com.android.settings.flags.catalyst_tether_settings
Test: atest TetherSettingsTest; manual
Change-Id: Ib3859d950b2d12c2fbb54dee85b20cdf2518f6b6
2024-12-06 09:32:43 +00:00
Treehugger Robot
aa2379967c Merge "Remove replicated page of Satellite SOS." into main 2024-12-06 05:06:04 +00:00
tomhsu
c2d25241a1 Remove replicated page of Satellite SOS.
Flag: EXEMPT bug fix.
Bug: b/370509415
Test: make pass
Change-Id: Iff96dd09f8c0876a32064853629f64b0db173099
2024-12-06 03:06:52 +00:00
Weng Su
efbe144a9a [Catalyst] Migrate Airplane Mode preference
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: Manual testing
atest -c AirplaneModePreferenceTest \
         NetworkDashboardFragmentTest
atest -c NetworkDashboardScreenTest

Change-Id: Ie63f2208a64cadf5faaa274fd4e069d839da850e
2024-12-05 09:10:54 +00:00
Jin Jeong
7975c1c217 Merge "New System API to launch SIM Preference in Setting" into main 2024-12-04 01:31:58 +00:00
Treehugger Robot
351f6258d8 Merge "Satellite UX - Add learn more into Footer" into main 2024-12-03 12:57:03 +00:00
Tom Hsu
13c6cad5dc Merge "Fix crash due to no Satellite" into main 2024-12-03 11:30:08 +00:00
tomhsu
ceac8c1dde Satellite UX - Add learn more into Footer
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: 378408877
Test: atest pass
Test: Manual test pass.
Change-Id: I27f2c82fe5d6c34cf204472c4199538326d6aec4
2024-12-03 11:21:18 +00:00
tomhsu
9329684c86 Fix crash due to no Satellite
- AutoSelectPreferenceController get null pointer exception

Flag: EXEMPT bug fix
Fix: b/381995900
Test: atest pass
Change-Id: Iadbd83825cdfbc0aabd85b79e9ad7043f172a8a1
2024-12-03 09:02:31 +00:00
Weng Su
9faf231dc4 [Catalyst] Migrate Wi-Fi switch preference
NO_IFTTT=Add Catalyst preference

Bug: 372733639
Flag: com.android.settings.flags.catalyst_internet_settings
Test: Manual testing
atest -c NetworkProviderSettingsTest \
         NetworkProviderScreenTest
atest -c WifiSwitchPreferenceTest

Change-Id: Ic6023907608e831d0a946005dd0eb6fd88b301c0
2024-12-03 06:51:18 +00:00
Jacky Wang
f96ae34080 Merge changes from topic "catalyst-sims" into main
* changes:
  [Catalyst] Migrate "Mobile data"
  [Catalyst] Migrate SIMs entry point
2024-12-02 08:32:19 +00:00
Chaohui Wang
7bee1511ce Merge "Fix TetherPreferenceController ANR" into main 2024-12-02 07:52:59 +00:00
Treehugger Robot
d0e7d9fce6 Merge "Completed basic UI of Satellite SOS" into main 2024-12-02 07:01:10 +00:00
tomhsu
37ed715145 Completed basic UI of Satellite SOS
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: Manual test
Change-Id: Iadef197b3da1008abedb88864f17087502ab7d36
2024-12-02 05:28:43 +00:00
Jacky Wang
344ba6912c [Catalyst] Migrate "Mobile data"
Bug: 368355368
Flag: com.android.settings.flags.catalyst_mobile_network_list
Test: devtool
Change-Id: Id6092f37e0790566a2fdeb8a6f10e17ad79def78
2024-12-02 12:30:50 +08:00
Chaohui Wang
e731f7cce2 Fix TetherPreferenceController ANR
getAvailabilityStatus() is called in main thread, so we should avoid
time consuming works in it.

Fix: 377146536
Flag: EXEMPT bug fix
Test: manual - on Network & internet
Test: unit test
Change-Id: Ib5ee19744cf164f91aa90be982f5fc5eead5d4d3
2024-12-02 11:56:54 +08:00
Chaohui Wang
a25c82a346 Merge "Fix checkSimIsReadyAndGoNext()" into main 2024-12-02 03:46:37 +00:00
Jacky Wang
36684ec80d [Catalyst] Migrate SIMs entry point
NO_IFTTT=Catalyst only

Bug: 368355368
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: Manual
Change-Id: I2f3526c1ccb50490b955ad5f98c19d9ce2f5f21d
2024-12-02 11:26:37 +08:00
Tom Hsu
4937645ce3 Merge "Create a Satellite SOS entry" into main 2024-11-29 09:18:37 +00:00
Chaohui Wang
bd4990d020 Fix checkSimIsReadyAndGoNext()
This function is waiting for sim to be enabled, then goto next step.

Before this fix, receiver register / unregister is not lifecycle scope
awareness, after fix this, use flow, which is cancelled when the
coroutine lifecycle scope cancelled.

Fix: 381153100
Flag: EXEMPT bug fix
Test: manual - switch between two sims (hard code dsds requires reboot)
Change-Id: If9cbb0cbf7d460b659d827897306c07d642bb231
2024-11-29 16:04:42 +08:00
tomhsu
90092e7da4 Create a Satellite SOS entry
- This is a entry to start Satellite SOS pagein mobile network page.

Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/370509415
Test: atest pass
Change-Id: I3978513b15ad498b9b8ea298060d89fd35efc7ed
2024-11-29 07:19:36 +00:00
Jacky Wang
8a97245b3d [Catalyst] Add sensitivity level
NO_IFTTT=Catalyst only

Bug: 380457585
Flag: com.android.settings.flags.catalyst
Test: Manual
Change-Id: Ia98a925011723738e1a16cc0e0c3d703d3dbd505
2024-11-29 07:36:13 +08:00
jinjeong
2e7db438ab New System API to launch SIM Preference in Setting
Bug: b/381319469
Test: Manual
FLAG: com.android.internal.telephony.flags.action_sim_preference_settings
Change-Id: I91815464a2462820de4f3db1bd59e6987910089d
2024-11-28 12:22:53 +00:00
tomhsu
9ca8709173 Disabled Settings preference in case Satellite's conditions.
Conditions
   - Satellite session started
   - Current subscription for Satellite is carrier based.
 Target preference UI in android settings
   - preferred network type
   - Automatically select network

Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Fix: b/378409439
Fix: b/378409428
Test: atest pass
Test: Manual test pass
Change-Id: I7aa04b818c8866bf5c891c28372a249c964b066f
2024-11-28 10:37:35 +00:00
Tom Hsu
01043fdf93 Merge "Fix crash due to no SatelliteManager" into main 2024-11-28 06:19:44 +00:00
tomhsu
55de3bf24b Fix crash due to no SatelliteManager
Flag: EXEMPT bug fix
fix: 381212236
Test: make pass
Change-Id: Ic10ad27c1e84ac29c5c1ccf81c073d6f216ed32e
2024-11-28 04:32:26 +00:00