Commit Graph

1464 Commits

Author SHA1 Message Date
Chaohui Wang
874c818b31 Settings search for Vo5G
Also adding keywords support to MobileNetworkSettingsSearchItem.

Fix: 262684662
Flag: EXEMPT bug fix
Test: manual - search vo5g
Change-Id: Ic73b76a2a7b2ef238b167fe3673835298d8939fd
2024-07-31 17:47:21 +08:00
Chaohui Wang
b7f68b4a60 Merge changes from topic "MobileNetworkSettingsSearchIndex" into main
* changes:
  Fix search for MMS Message
  Show category when search "Mobile data"
2024-07-31 09:07:20 +00:00
Chaohui Wang
30b9c3c1ae Merge "Create SubscriptionRepository.phoneNumberFlow" into main 2024-07-30 04:41:02 +00:00
Hakjun Choi
ad6c9cf31a Merge "[Internal cleanup] remove warning message for resource ID" into main 2024-07-30 04:38:09 +00:00
Chaohui Wang
7009c008f9 Fix search for MMS Message
Also display multiple results when there are multiple MMS Message on
different SIMs.

When doing indexing, we not also log sub id as part of the key.
When user clicks the result, using SpaSearchLandingActivity to do the
redirection, set arguments to the fragment.

Fix: 352245817
Flag: EXEMPT bug fix
Test: manual - search mms
Test: unit test
Change-Id: Id47a1151cb418c18f68f97e3be33dcd21c5f5102
2024-07-30 11:34:24 +08:00
Hakjun Choi
a0ba9182ad [Internal cleanup] remove warning message for resource ID
Currently we are seeing Drawable com.android.settings:drawable/ic_check_circle_24px has unresolved theme attributes! error
To address this, use Context.getDrawable(int) to provide theme info when using the icon

Bug: 356149221
Flag: EXEMPT bugfix
Test: manually run Satellite setting menu and check the log whether the waring is shown or not
Change-Id: I55fd1bd4cbaf07e7433cdd286e71f88dacc3e1b5
2024-07-29 16:46:38 +00:00
Chaohui Wang
cf13fe7776 Create SubscriptionRepository.phoneNumberFlow
And use it in the MobileNetworkSettings.

Fix: 341318273
Flag: EXEMPT bug fix
Test: manual - on MobileNetworkSettings
Test: unit test
Change-Id: I886373c1ed5129ebd8bcceedd513e9d1776106c8
2024-07-25 16:06:02 +08:00
Chaohui Wang
c181d60bac Fix race condition when requestNetworkScan
requestNetworkScan() could call callbacks concurrently, so we use a
single thread to avoid racing conditions.

Fix: 345494692
Flag: EXEMPT bug fix
Test: manual - do network scan
Change-Id: Ibf38442bbd9cfbbd0762b31347645810aca1113b
2024-07-25 10:23:21 +08:00
Chaohui Wang
fe712d3ea3 Merge "Always set cross sim calling" into main 2024-07-17 07:48:59 +00:00
Chaohui Wang
fb0583404f Always set cross sim calling
By CrossSimCallingViewModel, in SIMs and per SIM settings page.
To ensure the status is always right, including the case after the
onboarding set up finished.

Fix: 347882381
Fix: 348529996
Flag: EXEMPT bug fix
Test: manual - turn on / off "Automatic data switching" on SIMs
Test: manual - turn off "Automatic data switching" during onboarding
Change-Id: Icc2eacb67850fa7b3aa0fe310cd09a0e0147912b
2024-07-16 17:46:23 +08:00
yomna
62004763e1 Remove searchability of CellularSecuritySettingsFragment
Test: m & manual
Bug: b/335554085
Flag: EXEMPT bug fix
Change-Id: Ia226b0848d70a307b80060049ec24b9714ee476a
2024-07-16 01:17:25 +00:00
hoffc
e55e9dc90b Fix UI flashing after changing network mode
DashboardFragment will dynamically control every preference's visibility according to preference's availability status, but EID and IMEI preference controllers have incorrect visibility control logic when these two preferences are inavailable, which leads to confliction with DashboardFragment's visibility control logic.

Remove EID and IMEI preferences's visibility settings from their controllers.

Bug: 335369817
Test: the author has tested.
Flag: EXEMPT bugfix
Change-Id: I572f9de07ff3fb8b39294d4b54b04a40a26a78ab
2024-07-02 09:45:16 +00: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
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
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
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
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
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
Yomna Nasser
23377dcf4c Merge "Remove unneeded init & displayPreference functions" into main 2024-06-04 16:36:13 +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
yomna
a2f5b59014 Remove unneeded init & displayPreference functions
Bug: 330336498
Test: m & atest CellularSecurityNotificationsDividerControllerTest CellularSecurityNotificationsPreferenceControllerTest CellularSecurityEncryptionDividerControllerTest CellularSecurityPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I791ad88738da24916b2c48e9b24f404707fc7047
2024-06-03 22:41:25 +00:00
Ganesh Vilas Chaudhari
b300cae17d Show cdma network mode choices
- Show cdma network mode choices if current radio supports 3GPP and
  3GPP2 radio technologies at the same time

Change-Id: I2d849e2eddc2c5bef289f39c015ebc6c744edcab
2024-05-30 14:32:02 +05:30
Chaohui Wang
1bfea5d472 Check if ECBMode when deactivate SIM card
If in ECBMode, start ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS to show a
dialog instead.

This align with the current airplane mode switch.

Fix: 191943857
Test: adb shell cmd phone emergency-callback-mode
Test: unit test
Change-Id: Icf646cd76990d621121b4367ec0fd02a3880b85c
2024-05-30 16:37:51 +08:00
tomhsu
a5f3d46539 Fix Crash due to runtime exception from CarrierManager
Fix: 329754400
Test: atest passed
Change-Id: I6065160dcd15d547241dd8bc0f9f99c336c59625
2024-05-29 05:11:59 +00:00
Chaohui Wang
a54a9756c0 Merge "Setup backup calling for new UI" into main 2024-05-27 09:03:01 +00:00
Chaohui Wang
a45efe1bbf Sort in slot selectable subscriptions first
Then the ones that not in slot.

Bug: 340361264
Test: manual - on SIMs
Test: unit test
Change-Id: If7150bd2fa5c1b7d42fe34ef2e814ba540454ed8
2024-05-27 07:39:38 +00:00
Chaohui Wang
59a28a244c Setup backup calling for new UI
Backup calling new handles by CrossSimCallingViewModel.
CrossSimCallingViewModel keep monitoring the active SIMs, and setup
backup calling if needed.

Fix: 340444839
Test: manual - SIMs
Test: manual - Mobile Settings
Test: unit test
Change-Id: I0a3451f1e8c3984b2348cf628fb1d91ce7aaecec
2024-05-27 15:16:33 +08:00
Xin Li
f0e00b8bf7 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
2024-05-23 14:12:07 -07:00
SongFerng Wang
392fb96dfc Merge "Add the Primary IMEI" into main 2024-05-23 19:20:32 +00:00
songferngwang
f42ec74abf Add the Primary IMEI
As per GSMA specification TS37, below Primary IMEI requirements are mandatory to support

-TS37_2.2_REQ_5
-TS37_2.2_REQ_8 (Attached the document has description about this test cases)
Bug: 341006304
Test: atest MobileNetworkImeiPreferenceControllerTest

Change-Id: I839440de7d2680d21832dce6d0d56db992796fca
2024-05-23 09:12:06 +00:00
Chaohui Wang
fa0c8d4fd1 Migrate to new ImsRegistrationCallback
Migrate from deprecated api, and use new api as flow.

Bug: 337417520
Test: manual - on SIM status
Test: unit test
Change-Id: I8f938c0ccb6e3e61f8d4f6cb72c293f564351d52
2024-05-22 10:51:00 +08:00
Chaohui Wang
ec8ce02ba4 Sort selectable subscriptions by sim slot index
To match the sorting order in
SubscriptionManagerService.getAvailableSubscriptionInfoList.

Fix: 340361264
Test: manual - on SIMs
Test: unit test
Change-Id: I06b6c61304f9e6c9515b5f989294417ac3f82a60
2024-05-20 11:38:58 +08:00
Hakjun Choi
f0d2581cd3 Merge "Add activity expose condition for Satellite messaging activity" into main 2024-05-17 07:16:23 +00:00
Chaohui Wang
6f01512762 Fix CellInfoUtilTest
Fix: 337417936
Fix: 337417222
Test: unit test
Change-Id: I47dfa05fd4839885ad7f2115a279a7b4675e85fc
2024-05-17 12:29:58 +08:00
Hakjun Choi
2bc6d77cbf Add activity expose condition for Satellite messaging activity
In case carrier_enabled_satellite_flag or KEY_SATELLITE_ATTACH_SUPPORTED_BOOL is not supported, activity invocation intent will be ignored.
Because the guidance description of the activity cause misunderstanding to users when the satellite feature is not set properly.

Bug: 338377564
Test: manual test adb shell am start -a "android.settings.SATELLITE_SETTING" --ei sub_id (test sub id) for each key's enable/disable combination for KEY_SATELLITE_ATTACH_SUPPORTED_BOOL and carrier_enabled_satellite_flag
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:308ced3fc8e69378611ce333ed5f0e8337ff91fe)
Change-Id: Ib5401f433f802e7aa74cc175179776deb576edfc
2024-05-16 15:32:30 +00:00
Chaohui Wang
3e8e8ff87e Create VoNrRepository
Migrate to flow and not call setVoNrEnabled in main thread.

Fix: 339846642
Fix: 339542743
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I27fe7cb2ddadc9a0aaa8c589af4703210b33612d
2024-05-16 14:50:16 +08:00
songferngwang
de7c5e50a2 Fix the BasePreferenceController.createInstance's IllegalStateException am: 7489c93347
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27358857

Change-Id: I7fe4219091a7428f42e4b33d0ccc4445b66569f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 12:39:26 +00:00
songferngwang
7489c93347 Fix the BasePreferenceController.createInstance's IllegalStateException
When the settings search do BasePreferenceController.createInstance,
it get the the IllegalStateException, and then the search ignore this
controller. It causes the indexing can not filter this controller via
the PreferenceController's getAvailabilityStatus.

Bug: 335509130
Test: Build pass. Do search and no crash
Change-Id: Icaff8ca690ca3e3a46c2f21a5fbde0bbd99fd92e
2024-05-15 09:26:44 +00:00
Chaohui Wang
381638f284 Merge changes If41d957f,I5c49d195 into 24D1-dev
* changes:
  Fix empty network scan result
  Create NetworkScanRepository
2024-05-15 07:50:58 +00:00
Chaohui Wang
99b09df4a8 Fix empty network scan result
Settings use TelephonyScanManager.NetworkScanCallback to scan, and its
onComplete() could happens before onResults().

We will change Settings to fix.

Fix: 338986191
Test: manual - on NetworkSelectSettings
Test: unit test
Change-Id: If41d957f916a99eacc1becb6b460e58722a4dca7
Merged-In: If41d957f916a99eacc1becb6b460e58722a4dca7
2024-05-15 15:29:55 +08:00
SongFerng Wang
bbc605efd0 Merge "Fix search indexed the item from the invisible sim" into 24D1-dev am: 365cc18c40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27341396

Change-Id: Ibecc4037975cc50636daecb18b243a1a5183f3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 07:17:08 +00:00