Commit Graph

3280 Commits

Author SHA1 Message Date
Chaohui Wang
d101f2d154 Merge "Clean up MobileNetworkInfoEntity unused fields" into main 2024-06-28 05:18:07 +00:00
Chaohui Wang
6afb2f3006 Merge "Not use SubscriptionInfoEntity in DataUsageList" into main 2024-06-28 05:14:06 +00:00
Chaohui Wang
b8ad25f8bd Clean up MobileNetworkInfoEntity unused fields
It's safe since MobileNetworkDatabase is in memory only.

Bug: 348118234
Flag: EXEMPT clean up
Test: manual - check Mobile Settings
Change-Id: I25141a87b9afb42b85d73cbcd7307b899b3f0a3b
2024-06-27 17:30:19 +08:00
Chaohui Wang
af56a3ea21 Not use SubscriptionInfoEntity in DataUsageList
Carrier id will be get in DataUsageListAppsController async.

Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on DataUsageList
Change-Id: I06b361f38d04c5020431cd8c6e359aa3a69942e5
2024-06-26 11:58:07 +08:00
Chaohui Wang
b70c805717 Fix unable to erase eSIM
Before this change,
- eSIM will be erased twice, one with result callback and one without
  result callback.
- During reset, ResetNetworkConfirm could interrupted by subscription
  invalid event, which happens during reset.

After this change,
- eSIM will be erased only once, result callback is registered
  separately.
- Explicit exit the page when reset finish, and ignore the subscription
  invalid event after reset started.

Bug: 328293508
Flag: EXEMPT bug fix
Test: manual - dry run the reset
Test: ResetNetworkConfirmTest
Change-Id: I51395a556b1c8775192d5897a87f13046c042578
2024-06-26 11:02:56 +08:00
Chaohui Wang
edc72a9b0f SubscriptionRepository.activeSubscriptionIdListFlow
Bug: 328293508
Flag: EXEMPT refactor
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I63a86569f4fa3a27bd38d9853f6141890d26b881
2024-06-26 10:55:59 +08:00
Chaohui Wang
67d977b72e Merge "Clean up MobileNetworkRepository.DataRoamingObserver" into main 2024-06-25 09:37:01 +00:00
Chaohui Wang
3e393d0a46 Merge "Fix Talkback can focus on blank area" into main 2024-06-25 06:51:12 +00:00
Chaohui Wang
a23c53c9a9 Fix Talkback can focus on blank area
By hiding radio button frame instead of just radio button.

Fix: 347185801
Flag: EXEMPT bug fix
Test: manual - on ApnSettings
Change-Id: I7a2ba536f037a6cd014989bba1374d034169d90b
2024-06-25 13:26:12 +08:00
Chaohui Wang
b132ed91b1 Clean up MobileNetworkRepository.DataRoamingObserver
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on Mobile Settings
Change-Id: If9e7ed7cde0d7864ff00d135339a7725de179f1b
2024-06-25 12:12:41 +08:00
tomhsu
f60b42acad When received Carrier Config Change, refresh UI.
Flag: EXEMPT bug fix
Fix: 340890663
Test: Manual test
Change-Id: Ia78c2dfb7e567161bcbb8d1d622cdccb178778e0
2024-06-24 13:04:18 +00:00
Chaohui Wang
0bd8a5d232 Merge "Use wifiCallingReadyFlow in WifiCallingSettingsForSub" into main 2024-06-24 02:09:16 +00:00
Chaohui Wang
4d8c8faa9e Merge "Clean up unused fields from MobileNetworkRepository" into main 2024-06-21 13:25:46 +00:00
Chaohui Wang
562f56bb7a Use wifiCallingReadyFlow in WifiCallingSettingsForSub
Simply and unify the logic, and fixed a crash.

Fix: 348372605
Flag: EXEMPT bug fix
Test: manual on Wi-Fi calling
Change-Id: Idc7dff934323fbebb09137bbd0585575e65a7867
2024-06-21 16:53:38 +08:00
Chaohui Wang
cfd401b04e Fix crash in RoamingPreferenceController
With new MobileDataRepository.isDataRoamingEnabledFlow() to provide
the data instead of MobileNetworkRepository.

Fix: 347224962
Flag: EXEMPT bug fix
Test: manual on Mobile Settings
Test: unit test
Change-Id: I2a994cb11c93296fb46558f566d6d4467ba4c846
2024-06-21 04:39:44 +00:00
Chaohui Wang
ef12f1ddb5 New CarrierConfigRepository
Benefices,
- Gets the configuration values of the specified keys, for better
  performance
- Check key suffix for correctness
- Support cache
- If CarrierConfigManager throw exception, use default value

Bug: 337417520
Flag: EXEMPT refactor
Test: manual on Sim Status
Test: unit
Change-Id: I68f41ef66d495080f628794ade63cf807efba619
2024-06-21 04:39:24 +00:00
Chaohui Wang
ec59cd0c8b Move mobile data logic into MobileDataRepository
Bug: 347224962
Flag: EXEMPT refactor
Test: manual on Mobile Settings
Test: unit
Change-Id: I2b54f9e6c4addafd31d7d96f2a44870cd54fe185
2024-06-20 11:49:06 +08:00
Rambo Wang
700fff1eb7 Merge "Fix Settings restart during Reset mobile nework settings flow" into main 2024-06-19 14:41:46 +00:00
Rambo Wang
5ac9d9c8fa Fix Settings restart during Reset mobile nework settings flow
This CL avoids restarting Settings in the reset mobile flow when phone
process is restarted, by switching the usage of the stable content
provider connection to the unstable client.

The CL also arranges restarting phone process as the last reset
operation in the flow (later than RILD reset) to avoid any reset
operation get impacted by phone process restarting.

Since the permission to protect the TelephonyContentProvider has been
renamed, the CL also renames the requsted permision.

Bug: 347047105
Test: atest ResetNetworkOperationBuilderTest
Test: Reset mobile network feature test
Flag: EXEMPT resource update with minor refactoring
Change-Id: I7bfa79bc9d7451a4a03269704b0009a3730e287f
2024-06-19 14:41:19 +00:00
Chaohui Wang
e36a2d863e Clean up unused fields from MobileNetworkRepository
Bug: 348118234
Flag: EXEMPT refactor
Test: manual on Mobile Settings
Change-Id: I45520aac3bd3f2e31c396056f4f38b52e4e6fa55
2024-06-19 15:40:54 +08:00
Chaohui Wang
03ccaf8b9d Merge "Refactor ApnEditCarrierEnabled" into main 2024-06-19 05:21:24 +00:00
Chaohui Wang
71331802ef Refactor ApnEditCarrierEnabled
Also fix tests.

Bug: 342374681
Flag: EXEMPT refactor
Test: manual - on Apn Edit
Test: unit test
Change-Id: I6db7f27a26341084940be4f8039f5097faa07ec8
2024-06-19 02:19:29 +00:00
Chaohui Wang
c956160fe7 Lazy create InternetPreferenceRepository
In InternetPreferenceControllerV2, to not created in search indexing for
better performance.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Change-Id: I9e0e36ba6296d48d3761714db52074c90f635233
2024-06-18 17:26:21 +08:00
Hakjun Choi
254cf32ba7 Merge "Add a condition for preventing NPE when accessing SatelliteManager" into main 2024-06-18 04:01:46 +00:00
Chaohui Wang
dc02b5ea59 Reduce api calls when getDataSummary
When defaultSubId == activeSubId, return display name directly.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Change-Id: I8422c709483069a6894b99d5cc2cc652459ab5e0
2024-06-17 15:43:07 +08:00
Hakjun Choi
bdfd24ed5a Add a condition for preventing NPE when accessing SatelliteManager
There could be a case that FEATURE_TELEPHONY_SATELLITE is false but KEY_SATELLITE_ATTACH_SUPPORTED_BOOL it true
Since SatelliteManager can be returned only when FEATURE_TELEPHONY_SATELLITE is enabled, added a condition checks whether SatelliteManager is null or not

Bug: 347057183
Test: atest SatelliteManagerTest SatelliteManagerTestOnMockServiceTest
      manually e2e test with FEATURE_TELEPHONY_SATELLITE disabled
Change-Id: I3f51e6805ccab3366d9d01be2e999818cd18354f
2024-06-17 06:26:21 +00:00
SongFerng Wang
0cc20946c8 Merge "Add metricsCategory for dualsim and apnEdit" into main 2024-06-14 09:25:47 +00:00
songferngwang
d73f0e3c77 Add the timer for waiting sim ready
When the sim onboarding setup the primary sim,
the psim is not ready.

Bug: 346623465
Test: verified this case.
Change-Id: Ide5a5de4f19deb7de6dd093df4dd267329b82046
2024-06-14 05:29:22 +00:00
songferngwang
d4e467ed4a Add metricsCategory for dualsim and apnEdit
Bug: 347091697
Test: Build pass
Change-Id: I783a45269112d91d79c00af41c0052ba488603d2
2024-06-13 23:00:29 +00:00
Chaohui Wang
52d15b6c34 InternetPreferenceController V2 (6/n)
Treat carrier merged Wi-Fi as cellular.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ie14c36f0f22c332319c097150b06cfeec97e946f
2024-06-13 15:08:22 +08:00
Chaohui Wang
c5cc30f0c3 InternetPreferenceController V2 (5/n)
Support ethernet.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I73fc9334379daa979f736fc9ff31c3d576a3381b
2024-06-13 13:29:13 +08:00
Chaohui Wang
0d758dfdb9 InternetPreferenceController V2 (4/n)
Display different icon for different condition.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ic06b0e349a284f8b4466bd0c19f318a6a0936a6e
2024-06-13 13:29:13 +08:00
Chaohui Wang
2717f70ac0 InternetPreferenceController V2 (3/n)
Add DataSubscriptionRepository, when cellular connection,
show the active subscription name.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: If2a3e7f8df1b1ed89bc760ec5165182b3e9b64a8
2024-06-12 15:33:38 +08:00
Rambo Wang
98920c3714 eSIM profile is not erased during Reset mobile network settings flow
The CL fixes the bug that eSIM profile is not erased even if user
choose to erase eSIM during Reset Mobile Network Settings flow.

The issue was introduced when adding background operations to
restart Phone process and RILD. Restart Phone process performed earlier.
It may interrup the previous reset operations (e.g. eSIM erasing).

The fix here is to arrange reset Phone and RILD in the end of the flow,
only performed after all other reset operations.

Bug: 345854350
Test: atest ResetNetworkOperationBuilderTest
Test: Manual regression test
Change-Id: If2bd492d417a07a7056bf9fd0d051f8811ba6369
2024-06-11 18:18:15 +00:00
Chaohui Wang
86f4ed16f3 Fix preferred apn not selected when back from edit
When back from edit page, preferred apn and apn list will both refresh,
if apn list refresh happens later, it will clear the preferred apn.

Saved the latest preferred apn into mPreferredApnKey to fix.

Bug: 257316932
Test: manual
Change-Id: I62f9cbd5847b7edb834c815cdecc089e0764a8c7
2024-06-11 14:01:03 +08:00
Chaohui Wang
2d7cae2d75 Merge "InternetPreferenceController V2 (2/n)" into main 2024-06-11 02:37:23 +00:00
Treehugger Robot
1b791e8b1b Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 am: 95da1e4de2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ie62ff501460906c7973a0c393f61d284c0599a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 09:15:35 +00:00
Treehugger Robot
95da1e4de2 Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 08:56:58 +00:00
Chaohui Wang
52b5aef999 InternetPreferenceController V2 (2/n)
Add ConnectivityRepository, when no validated connection,
show "Airplane mode is on" or "Networks available".

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I227d896fd52c099fb6d58a7ab60e98983fdab8cf
2024-06-07 15:28:46 +08:00
hoffc
de3f413ecd Fix NPE force close if disabling BT feature
adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
2024-06-07 13:00:03 +08:00
Chaohui Wang
efa1f0e3ed InternetPreferenceController V2 (1/n)
Refactor the InternetPreferenceController, migrate to repository and
flow, run data loading on background thread.

Only add Wifi summary for now.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ibd8911bc11b24d4a7e2ef320dea4d38b9c3a864f
2024-06-07 12:28:44 +08:00
SongFerng Wang
1a2450c8cf Merge "Show cdma network mode choices" into main am: 392f07f415 am: 5a979e94a8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I0563db1d6a4d11351951d3dca82b0f2b1799b184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 14:35:51 +00:00
SongFerng Wang
5a979e94a8 Merge "Show cdma network mode choices" into main am: 392f07f415
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 14:24:26 +00:00
Chaohui Wang
f2930aad5d Fix mSubscriptionInfoEntity NullPointerException
Due to concurrent, mSubscriptionInfoEntity could become null when
inference.

Save the subscriptionInfoEntity to local variable to fix.

Fix: 345319514
Test: manual on MobileNetworkSettings
Change-Id: I9d286b30ade65dabdfd4a394cdbe1c1c87435d02
2024-06-06 14:26:06 +08:00
Chaohui Wang
39dfb52c6f Stop network scan before manual select network
Otherwise device could not connect to network.

Bug: 339226604
Test: manual - Choose network
Change-Id: Ia7e52ad94d5406cab42bd8e7b25ba7e4e13c67fc
2024-06-05 17:38:22 +08:00
Treehugger Robot
e0bccf1d5c Merge "Revert "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SE..."" into main 2024-06-05 03:17:36 +00:00
David Jacobo
19a96c7cbd Revert "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SE..."
Revert submission 27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG

Reason for revert: per b/338527563#comment37, this was wrongly pointed out as culprit, looping folks conducting investigation as +cc

Reverted changes: /q/submissionid:27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG

Change-Id: Id3dfdac978227d0fd065f1eb59b525f041fad3d2
2024-06-04 22:35:00 +00:00
Yomna Nasser
23377dcf4c Merge "Remove unneeded init & displayPreference functions" into main 2024-06-04 16:36:13 +00:00
Chaohui Wang
7030928506 Merge "Finish mobile settings if sub id not exists" into main 2024-06-04 12:46:08 +00:00
Chaohui Wang
3ad527640e Finish mobile settings if sub id not exists
Could be test with,
adb shell am start \
  -a android.settings.NETWORK_OPERATOR_SETTINGS \
  --ei android.provider.extra.SUB_ID 999

Bug: 336232487
Test: manual - on MobileNetworkSettings
Change-Id: I74d5d5b743c40375ceba1ba6e761da901d0d5e65
2024-06-04 18:15:24 +08:00