Commit Graph

3132 Commits

Author SHA1 Message Date
Thomas Nguyen
f6f2f6135d Disable SIM On/Off operation when device is in a Satellite session am: c6005fb22a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27073216

Change-Id: I529d0a86739891873c205b3ff9eff065e50ed201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 21:56:40 +00:00
Thomas Nguyen
c6005fb22a Disable SIM On/Off operation when device is in a Satellite session
Bug: 330585109
Test: SatelliteManagerTestOnMockService SatelliteSessionControllerTest SatelliteControllerTest
Manual test with demo and real mode

Change-Id: Iade6426981f76a0b9b71828e0c86d3088c3e974e
2024-04-24 16:35:13 +00:00
Chaohui Wang
a968e2dea8 Merge "Get icon id from CellIdentity instead of CellInfo" into main 2024-04-24 03:56:49 +00:00
Hyunho Shin
ebc05f131d Merge "Add a try-catch statement to handle the runtime exception" into main 2024-04-23 10:51:29 +00:00
Chaohui Wang
dae4c04b74 Get icon id from CellIdentity instead of CellInfo
Currently NetworkSelectSettings.forceUpdateConnectedPreferenceCategory()
only pass CellIdentity, but not the CellInfo.

Get icon id from CellIdentity to fix.

Fix: 336238346
Test: visual - on NetworkSelectSettings
Change-Id: Ia30a45eef9d55815c8a45629c86cf83a6a480868
2024-04-23 17:22:24 +08:00
Chaohui Wang
174acf5c67 Merge "Remove existing list when force update network" into main 2024-04-23 09:02:25 +00:00
Hyunho
fa2f6ebce4 Add a try-catch statement to handle the runtime exception
Bug: 335903173
Test: manual test
Change-Id: I657a907b01229473ad2ef21b1d843e5d7de74945
2024-04-23 08:13:01 +00:00
Chaohui Wang
a339f019e2 Remove existing list when force update network
Otherwise it could including previous scan result when re-enter the
page.

Fix: 336244021
Test: manual test - on NetworkSelectSettings
Change-Id: I34b4820b116868b98649202c424d2168746232e8
2024-04-23 13:43:59 +08:00
Charlotte Lu
893e8d1f4b Merge "[WIFI-WEP] Add WEP dialog in System UI." into main 2024-04-23 05:28:37 +00:00
Chaohui Wang
5ae84662b5 Check isConvertedPsimSubscription in new UI
Bug: 326896614
Test: manual test
Change-Id: I0d3c87a863f58a9e962fb87df5b8001be9edb767
2024-04-22 18:14:20 +08:00
Chaohui Wang
ea89a3cb1d Not include user input in regex am: 4f5920c3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27048156

Change-Id: I2a3740b52b65ff650f309aa62a42e57f9ba8dffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 06:34:24 +00:00
Chaohui Wang
4f5920c3f5 Not include user input in regex
Check prefix and remove prefix first, to avoid include user input in
the regex to fix.

Fix: 335136289
Test: manual - on SIMs
Test: unit test
Change-Id: Iff4dcfc3662c744d00b586d05e64b4f5fe33a0d8
2024-04-22 04:56:57 +00:00
Hyunho Shin
74aecaf6bc Merge "When the transfer status is CONVERTED, the menu on the pSIM is greyed out." into main 2024-04-19 16:43:50 +00:00
SongFerng Wang
e529a1233c Merge "Using the new sim ui when user insert psim" into main 2024-04-19 15:49:17 +00:00
Hakjun Choi
1227eb311f Merge "Return empty list when SatelliteManager is not created" into main 2024-04-19 13:21:40 +00:00
songferngwang
aecc940987 Using the new sim ui when user insert psim
When device has two active esim and the user insert psim, the settings
will popup the dailog to ask user select the two sim card.
Now, there is the new sim UI, so it should show the new one.

Bug: 335780975
Test: verify UI
Change-Id: I298d488d467c447d6f8d91d86383708a4d1f70c9
2024-04-19 07:44:22 +00:00
Treehugger Robot
29ad4163c2 Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-18 17:46:59 +00:00
Rafael Higuera Silva
6389239f76 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-18 16:28:38 +00:00
Chaohui Wang
660986353e Fix NetworkScanRequest maxSearchTime
Which should read from resource
R.integer.config_network_scan_helper_max_search_time_sec

Fix: 334814332
Test: manual - with network scan
Change-Id: I4afefe6470d6ef4bf325e83a0decce41b321e201
2024-04-18 05:41:11 +00:00
Meng Wang
63d10cc4ba When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 329202869
Test: manual - see b/329202869#comment41
Merged-In: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
Change-Id: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
(cherry picked from commit f4462ac5c2)
2024-04-17 22:16:46 +00:00
Meng Wang
0f4680e79b Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into main 2024-04-17 22:15:39 +00:00
Meng Wang
f4462ac5c2 When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 329202869
Test: manual - see b/329202869#comment41
Change-Id: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
2024-04-17 22:13:23 +00:00
Treehugger Robot
f02cfc9526 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-17 17:30:24 +00:00
Hakjun Choi
65cb3dfee7 Return empty list when SatelliteManager is not created
TelephonyFrameworkInitializer returns null for SatelliteManager when the feature PackageManager.FEATURE_TELEPHONY_SATELLITE is not enabled.
Therefore it is needed to add a exception handling for the case SatelliteManager is null.

Bug: 331182758
Test: manually select choose network in Settings menu from CuttleFish to reproduce
Change-Id: I5faf4f10585b78aada00d0a925d005de1dd71de1
2024-04-17 16:25:41 +00:00
songferngwang
3219f6da97 Set Phone number format as LTR
Bug: 334339964
Test: verify the phone number format
Change-Id: Ifa5dc394c3d9b8d7565e6200a47b7cb9fb1bba84
2024-04-17 07:10:20 +00:00
Samuel Huang
8782bd4fdc Merge "Disable SIM On/Off operation when device is in Satellite Enabled Mode" into main 2024-04-16 09:54:41 +00:00
Samuel Huang
316e7bf3e6 Disable SIM On/Off operation when device is in Satellite Enabled Mode
Cherry-picking ag/26965536 into the 24D1-dev branch caused conflicts. Therefore, manually create this CL to migrate the MobileNetworkSwitchController to Kotlin and utilize Compose.

Bug: 315928920
Test: atest, manual
Change-Id: I215b5a4615a3b3da6fc160f76c85c814210cc3ef
Merged-In: I7aaaf43b4c449129197e7cc92565d274ffdd2d8c
2024-04-16 09:52:00 +00:00
SongFerng Wang
7eaa2b1661 Merge "Add the mobile data into new SIMs page" into main 2024-04-16 08:54:26 +00:00
songferngwang
e471604d32 Add the mobile data into new SIMs page
Bug: 329584989
Test: verify UI.
atest TelephonyRepositoryTest

Change-Id: Ia00ac287ffd0d15ba0c9350b731c3afc1a04b7a0
2024-04-16 07:20:21 +00:00
Samuel Huang
cbf5154291 Disable SIM On/Off operation when device is in Satellite Enabled Mode
Bug: 315928920
Test: atest, manual
Change-Id: I7aaaf43b4c449129197e7cc92565d274ffdd2d8c
2024-04-15 12:31:17 +00:00
Tom Hsu
758e69592c Merge "Revert "Fixs user input nothing, but save it successfully"" into main 2024-04-15 02:13:55 +00:00
Tom Hsu
880b8c6dbf Revert "Fixs user input nothing, but save it successfully"
This reverts commit 6f27b8bca7.

Reason for revert: wrong logic

Change-Id: Ic2eaaa5dd318a2eb92da1a3615590e7d132641a7
2024-04-15 01:50:12 +00:00
songferngwang
428aaacefa Fix the settings crash
When the user select mobile network settings item with subid=-1 in
the search list, then some of objects are not initialized.

Bug: 325956182
Test: atest AutoSelectPreferenceControllerTest
atest MobileNetworkPhoneNumberPreferenceControllerTest
atest MobileNetworkSpnPreferenceControllerTest
atest MobileNetworkImeiPreferenceControllerTest
atest WifiCallingPreferenceControllerTest

Change-Id: I17c24b6f542392f018c65b689862f9735fad4b9f
(cherry picked from commit e0b5de28ae)
2024-04-12 06:07:21 +00:00
Charlotte Lu
b13d63a30e [WIFI-WEP] Add WEP dialog in System UI.
Test: Visual Test
Fix: 328365908
Change-Id: Id4aca7ce4d014ff17ccde37e74d41cab920715cd
2024-04-12 05:50:15 +00:00
Hyunho
477b291b5d When the transfer status is CONVERTED, the menu on the pSIM is greyed out.
UX update for converted pSIMs.

Bug: 326896614
Test: manual test

Change-Id: I68ca181ec16c839ed8dc5dba3f8dc75aba09ab5b
2024-04-12 03:29:35 +00:00
Samuel Huang
ba03a22317 Avoid SIM card on/off dialog pop-up if satellite is enabled am: f2ed0ec752
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26847152

Change-Id: Ifb4f85972f29370d51a8c6363fa8efd63e6dead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 07:36:48 +00:00
Samuel Huang
f2ed0ec752 Avoid SIM card on/off dialog pop-up if satellite is enabled
In order to support Satellite SOS, device will have two modems, one for TN, one for NTN(satellite).

When device switches to satellite mode, PSS only disables TN eSIM (and not TN PSIM). Since NTN image only supports eSIM, there is no need to disable TN PSIM before switching to NTN image. Somehow device is seeing that TN PSIM is available and is showing the user to enable it. So we need to handle it by not showing this dialog during satellite mode enabled.

Bug: 330585109
Test: atest, manual
Change-Id: I9781b7e1cef8f7f10e7ecdbb23ca729da4d06eba
2024-04-11 05:20:53 +00:00
Rafael Higuera Silva
268fa16d5b Add logic to log interaction of RAC warning dialog.
Bug: 326618987
Test: make, atest EuiccRacConnectivityDialogFragmentTest
Change-Id: Iccec9245da27d525cfb3d74504ab86859e152a6e
Merged-In: Iccec9245da27d525cfb3d74504ab86859e152a6e
(cherry picked from commit ea0453e5f6)
2024-04-10 16:26:06 +00:00
songferngwang
77c89803ee After rotating the screen, lost the progress bar dialog state
Fix: 333646302
Fix: 333645488
Test: build pass. manually verify the UI
Change-Id: Ib68de902526ccb77bf19cbace4c596b1ecedaea5
2024-04-10 08:22:54 +00:00
tomhsu
6f27b8bca7 Fixs user input nothing, but save it successfully
- If user inputs nothing, do nothing for this action.

fix: 333642116
Test: Manual test
Change-Id: I66213f5d5c47d2b85d3849c95e7cf076e249420e
2024-04-10 06:50:05 +00:00
Rafael Higuera Silva
5405aa17a1 Add logic to log interaction of RAC warning dialog.
Bug: 326618987
Test: make, atest EuiccRacConnectivityDialogActivityTest
Change-Id: If4e3285b3715e9630d4932d4bf1bcb71e4167cff
Merged-In: If4e3285b3715e9630d4932d4bf1bcb71e4167cff
2024-04-09 17:14:35 +00:00
Tom Hsu
de9a888469 Merge "Listen wifi entry change to make sure UI correct." into main 2024-04-09 09:16:42 +00:00
Treehugger Robot
0f33518068 Merge "Add flag to control Internet preference" into main 2024-04-09 08:22:57 +00:00
tomhsu
91bcc2b594 Listen wifi entry change to make sure UI correct.
Bug: 319905522
Test: make pass.
Test: atest pass.
Change-Id: I0900caf6521bd9a250e85863f48e39668734f1be
2024-04-09 08:05:32 +00:00
Treehugger Robot
d5e69fa0ea Merge "Fix SMS and Calls preference summary displays empty." into main am: 3bfb35c71e am: a72f3f4ecc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3019410

Change-Id: I5c8ba3dc44ebe526ffd02ffbb0ef3a830a08b7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-09 04:35:47 +00:00
Rafael Higuera Silva
22b3304bf8 Merge "Add logic to log interaction of RAC warning dialog." into main 2024-04-08 21:23:37 +00:00
Rafael Higuera Silva
ea0453e5f6 Add logic to log interaction of RAC warning dialog.
Bug: 326618987
Test: make, atest EuiccRacConnectivityDialogFragmentTest
Change-Id: Iccec9245da27d525cfb3d74504ab86859e152a6e
2024-04-08 18:27:14 +00:00
Chaohui Wang
bae147bab3 Close ApnSettings when subscription not enabled
Including the case that physical sim is removed.

Fix: 332885481
Test: manual - on ApnSettings
Change-Id: I9bc77f995b6c1e98046a84fafb05f9b61d71ce70
2024-04-07 15:57:53 +08:00
Rafael Higuera Silva
f6e0b08fc6 Merge "Add new warning dialogue when user is Resetting mobile network settings." into 24D1-dev 2024-04-05 23:43:02 +00:00
Rafael Higuera Silva
363535192d Add new warning dialogue when user is Resetting mobile network settings.
If the user is reseting mobile network settings and have all these
conditions:
- No Wi-fi
- Has check to delete all eSIMs
- Has a least one RAC sim carrier
Then show the warning dialogue.

Test: make, manually test, atest SubSettingLauncherTest, atest ResetNetworkTest,  atest SubscriptionUtilTest
Bug: 328649510
Merged-In: I47d9b868b649b259d5e4008ec742317d2cb7cf51
Change-Id: I47d9b868b649b259d5e4008ec742317d2cb7cf51
(cherry picked from commit 147cc19b53)
2024-04-05 21:39:13 +00:00