Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,024 Commits 1 Branch 0 Tags
1bd9cab5a047ea850fa3dbf7d74d327b5095a919
Commit Graph

3168 Commits

Author SHA1 Message Date
Chaohui Wang
ffcbbd375a Clean up MobileNetworkSummaryStatus 
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
 2024-05-06 07:26:06 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Chaohui Wang
ad9c64fcdc Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: bbc3a352e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150958

Change-Id: I8398dcad2f0c0da66cf9c579c5adb5f4c91c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 08:12:16 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +00:00
Tom Hsu
219fb8a3f6 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150955

Change-Id: I02b98dfea84be429e9a46dc8d0e3846dda29f203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 07:24:09 +00:00
Tom Hsu
0a8d830616 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-30 07:05:49 +00:00
Chaohui Wang
7bbd8fa4e3 Reapply "Create CallStateRepository.isInCallFlow" 
This reverts commit 93e4c65d3d.

Fixed the test by cherry-pick change
I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: atest SubscriptionInfoListViewModelTest
Change-Id: Id606d6ee90acd8a98de706d8533fed0aac96bff4
 2024-04-30 12:33:54 +08:00
Tom Hsu
1b308f5df8 Revert^2 "Add a new warning dialog for Satellite mode" 
This reverts commit 15c90207e2.

Reason for revert: ag/27138142 shall fix the crash instead of reverted one.

Change-Id: Icf46fda7af9c9bb6921bc10de0f9c93926f42fac
 2024-04-30 02:17:15 +00:00
Priyanka Advani
fe0eedf1e3 Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27145129

Change-Id: Ica49442da20fcea404ad95a2591506991a8e55b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 22:48:38 +00:00
Treehugger Robot
c81e0cb16a Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-29 22:24:00 +00:00
Priyanka Advani
134635786f Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-29 22:13:31 +00:00
Priyanka Advani
93e4c65d3d Revert "Create CallStateRepository.isInCallFlow" 
This reverts commit 6142ad927e.

Reason for revert: Droid-monitor created revert due to Build breakage in b/337914519. Will be verifying through ABTD before submission.

Change-Id: I300d5397de156fd0815965cfd99f0814f1365ffc
 2024-04-29 20:31:15 +00:00
Chaohui Wang
e4e6f0ecf4 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev am: ac55241fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139248

Change-Id: Ie5cde4ca5e04167a63fd41adfb5ccd1376a0d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:24 +00:00
Tom Hsu
b5391d1d3f Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139078

Change-Id: Ib7b007734f3916b5caf652a79708f20f8df90bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:51:08 +00:00
Chaohui Wang
ac55241fc5 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev 2024-04-29 12:37:44 +00:00
Tom Hsu
45549d928b Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-29 12:34:55 +00:00
SongFerng Wang
55927a6318 Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev am: 33f5aa3897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139247

Change-Id: I832da1d22799ba554696a66c2087c1ab6c84e201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 12:03:05 +00:00
SongFerng Wang
33f5aa3897 Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev 2024-04-29 11:39:12 +00:00
ELIYAZ MOMIN
15c90207e2 Revert "Add a new warning dialog for Satellite mode" 
This reverts commit 680d062c77.

Reason for revert: <Potential culprit for b/337796129  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
>

Change-Id: I6fbb7a0587fbb474012e1a97a75c036420500f99
 2024-04-29 11:37:35 +00:00
Tom Hsu
71e0980f4c Merge "Add a new warning dialog for Satellite mode" into 24D1-dev am: cec2f402a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27113656

Change-Id: I4962f1906eb66b54385d459fc2a3cc987ee74b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-29 11:17:30 +00:00
Tom Hsu
cec2f402a9 Merge "Add a new warning dialog for Satellite mode" into 24D1-dev 2024-04-29 10:57:55 +00:00
Chaohui Wang
6142ad927e Create CallStateRepository.isInCallFlow 
Which will emit true if any active sub is in call.

And also create SubscriptionActivationRepository to use isInCallFlow.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: unit test
Change-Id: I75460bf17961349557ac1e19e7f6b15249f3d7b0
 2024-04-29 10:15:13 +00:00
SongFerng Wang
e2dcee3aec Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException 
Bug: 329293848
Change-Id: Id775f6db2a90a59278f9b522b60680695d75c4a4
Test: build pass
 2024-04-29 09:28:32 +00:00
tomhsu
680d062c77 Add a new warning dialog for Satellite mode 
Bug: 337154438
Test: atest pass.
Test: Maunal test pass.
Change-Id: I33dbf3502c780cedd5422e2b44678ecb9a22a662
 2024-04-29 08:37:28 +00:00
Meng Wang
bcf91ee6a7 When erasing an eSIM, verify the device screen PIN lock if one is set. 
SIM PIN lock existence isn't checked anymore.

Bug: 335672518
Test: b/335672518#comment6
Merged-In: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
Change-Id: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
 2024-04-26 21:28:58 +00:00
Treehugger Robot
a50513ec6d Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into main 2024-04-26 21:27:38 +00:00
Meng Wang
1331449353 When erasing an eSIM, verify the device screen PIN lock if one is set. 
SIM PIN lock existence isn't checked anymore.

Bug: 335672518
Test: b/335672518#comment6
Change-Id: Iff40c1fb9a2463311768d24d09dfc3aeeee128f9
 2024-04-26 20:33:38 +00:00
Samuel Huang
9b8558394c Fix the "Use this SIM" switch does not disable during phone calls am: 4f454b43c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27105181

Change-Id: I2be1b144aa7d1d120692ccfece3c921e488fc308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-26 09:13:17 +00:00
Samuel Huang
4f454b43c6 Fix the "Use this SIM" switch does not disable during phone calls 
If the registration failed (e.g., device doesn't support satellite), SatelliteManager will not emit the current state by callback. We send `false` value by ourself to make sure the flow has initial value.

Bug: 315928920
Test: atest, manual
Change-Id: Ic87f71bc576cfb1f8e4053c5784fca401adaec08
 2024-04-26 05:54:40 +00:00
Samuel Huang
a94bfd4a47 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev am: fea80bf236 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27071155

Change-Id: Idcbc71555ddbebbd28553530ca8ddd6e364635ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-26 03:22:25 +00:00
Samuel Huang
fea80bf236 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev 2024-04-26 03:08:53 +00:00
Rafael Higuera Silva
1d307afd95 Merge "Extract and fix logic for showing rac dialog." into 24D1-dev am: 958b737fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27072479

Change-Id: I9f5c4c8dea3c7aebc73b5121d6ace7aca22c1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-25 19:07:24 +00:00
Samuel Huang
faa640e8fc Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started 
When satellite session is started, we need to suppress the 'Choose SIM for mobile data' and 'Update preferred SIM' dialogs to prevent user turn on SIM.

Bug: 334139957
Test: atest, manual
Change-Id: Id56a98f3d1cfd38875173a643c992393d3dbeec8
 2024-04-25 13:34:43 +00:00
Chaohui Wang
446e0a18d1 Refresh the preferred APN after "Reset to default" 
Previously, ApnSettings will updated the preferred APN selection when
data connection changes, but this is not the source of truth.

Observe the preferred APN directly to fix.

Fix: 257316932
Test: manual - on ApnSettings
Test: unit test
Change-Id: Ie323316ab8f7fa63edf5cf90633bcdd4486728c4
 2024-04-25 11:14:21 +08:00
Rafael Higuera Silva
36d99e8b09 Extract and fix logic for showing rac dialog. 
Added tests to make sure the logic makes sense.

Bug: 335745726
Test: make, manual, atest SubscriptionUtilRoboTest, atest SubscriptionUtilTest, atest ResetNetworkTest
Change-Id: I7092f2747f1ca1f9ef4dc99275a916b9e24d8b28
 2024-04-25 01:34:47 +00:00
David Jacobo
240b32fa91 settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS 
This CL makes use of the newly introduced action for
NETWORK_PROVIDER_SETTINGS.

Bug: None
Test: atest -c ProviderModelSliceTest
Change-Id: Ie0ccde2f49502a634801401e1b33f1d4b9c7d728
 2024-04-24 17:08:42 -07:00
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