Commit Graph

3207 Commits

Author SHA1 Message Date
Chaohui Wang
513ca3a808 Refresh DataUsageSummaryPreferenceController
When re-enter the page contains it.

Fix: 341234382
Test: manual - on Data usage
Test: unit test
Change-Id: Ib6a4624e11b60d703c35cea07232cc24f1516389
2024-05-23 16:50:54 +08: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
Chaohui Wang
12158eb1fe Create NetworkScanRepository
And migrate network scan to flow for better maintenance and prevent ANR.

Fix: 323105271
Test: manual - Choose network
Test: unit test
Change-Id: I5c49d195fc202143c0131ffd78bc3adc168b119c
Merged-In: I5c49d195fc202143c0131ffd78bc3adc168b119c
2024-05-15 14:09:03 +08:00
songferngwang
6f8cc6f0b6 Fix search indexed the item from the invisible sim
When search start to index and run to MobileNetworkSettings.java, the
TelephonyBasePreferenceController will find which subId can be the
"AVAILABLE" from the active subscriptionInfo list. This active subscriptionInfo
list does not be filtered, so the search uses the invisibile sim's item for user.

Bug: 335509130
Test: atest MobileNetworkUtilsTest (pass)
Change-Id: I2840e7de344347643197592e125f5524d27a068e
2024-05-14 15:04:02 +00:00
Chaohui Wang
b63ed17b94 Merge "Use DataUsageFormatter to format app data usage" into main 2024-05-13 08:06:38 +00:00
Chaohui Wang
7ca1ceb722 Use DataUsageFormatter to format app data usage
Use the new unitsContentDescription from Formatter.formatBytes()

Fix: 318780411
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I55079c83db2e46a48f49f746f2371825ec0bb029
2024-05-13 12:41:27 +08:00
Chaohui Wang
881c19480a Fix isSubscriptionEnabledFlow crash
When INVALID_SUBSCRIPTION_ID.

Fix: 338014486
Test: unit test
Change-Id: I97b5f005fb99473c2712f9643704a35cfaeecfac
2024-05-13 11:25:46 +08:00
Chaohui Wang
59e2bce852 Merge "Fix empty network scan result" into main 2024-05-10 12:03:26 +00:00
Chaohui Wang
6e4ac4bdc0 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
2024-05-10 16:19:40 +08:00
Chaohui Wang
e216fd4248 No show DisableSimFooterPreference when sub not found
DisableSimFooterPreferenceController.getAvailabilityStatus() used to
return AVAILABLE when the subscription is not found in selectable
subscription info list.

Return CONDITIONALLY_UNAVAILABLE in this case to fix.

Bug: 336232487
Test: manual - on Mobile Settings
Change-Id: I88642fc9853ce6603a78dfdc0e5fed1da1553adc
2024-05-10 15:08:53 +08:00
Chaohui Wang
8c507e871b Catch exception in telephonyRepository.isDataEnabledFlow
And migrate BillingCycleRepository to use it.

Fix: 339197552
Test: manual - on data usage
Test: unit test
Change-Id: Ieac295f37fdbf75d184d66ea11f170652af3ec5f
2024-05-09 15:49:26 +00:00
tomhsu
180b2d9561 Expose SatelliteWarningDialogActivity
Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
Merged-In: I530c554433d99b4732416b8f1b83677ddc0ff6d8
2024-05-09 09:56:30 +00:00
tomhsu
a50dd92e49 Expose SatelliteWarningDialogActivity
Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
2024-05-09 06:16:34 +00:00
Treehugger Robot
eb729f283c Merge "Fix flicker of "App data usage"" into 24D1-dev 2024-05-09 05:50:55 +00:00
Tom Hsu
864122b8b7 Fix build break
Bug:339348046
Test: Build pass locally
Change-Id: I98db39d696617fc81fdad4e73419b34f5265b0ad
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 08:56:44 +00:00
tomhsu
c0b39601bf Show dialog on Wifi, and APM' entries in Settings
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
(cherry picked from commit 29b2f16edf)
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 05:40:36 +00:00
Chaohui Wang
9e5b389de3 Fix flicker of "App data usage"
Use placeholder to hold the place.

Fix: 323466366
Test: manual - on Mobile Settings
Test: unit test
Change-Id: I3c4d9ff6538a79500318869f01f4b88b55bd9475
(cherry picked from commit 74fe516e09)
Merged-In: I3c4d9ff6538a79500318869f01f4b88b55bd9475
2024-05-08 05:29:27 +00:00
Tom Hsu
c495d92a25 Merge "Show dialog on Wifi, and APM' entries in Settings" into main 2024-05-08 04:37:28 +00:00
SongFerng Wang
bc4293cb4e Merge "Refacotr mobile data observer for repository" into 24D1-dev 2024-05-08 03:59:47 +00:00
tomhsu
29b2f16edf Show dialog on Wifi, and APM' entries in Settings
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 03:53:32 +00:00
SongFerng Wang
e2eed370e9 Merge "Refacotr mobile data observer for repository" into main 2024-05-08 01:38:57 +00:00
Chaohui Wang
33df5bb68b Fix isInCallFlow when no active subscription am: c63f06d4c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27205448

Change-Id: I5a58046c3e7ed2a1164648516248b39ee4feb5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:48:55 +00:00
Chaohui Wang
c63f06d4c8 Fix isInCallFlow when no active subscription
Direct emit false in this case to fix.

Fix: 338484668
Test: manual - on SIMs
Test: unit test
Change-Id: I5286701160d95b1c06e577db6232f7e70f040cdb
2024-05-07 10:57:24 +00:00
Chaohui Wang
179a7204a3 Merge "Clean up unused params from SubscriptionAnnotation" into main 2024-05-07 09:40:34 +00:00
Mengjun Leng
120adb2349 Refacotr mobile data observer for repository
In current design, the mobile data observer might be removed due to
SIM absence after registered so that mobile data network info can't
be updated to clients.

To fix it, migrate it to use API TelephonyCallback.onUserMobileDataStateChanged
Bug: 327696232

Change-Id: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
2024-05-07 09:35:28 +00:00
Mengjun Leng
0a9e7046cc Refacotr mobile data observer for repository
In current design, the mobile data observer might be removed due to
SIM absence after registered so that mobile data network info can't
be updated to clients.

To fix it, migrate it to use API TelephonyCallback.onUserMobileDataStateChanged

Change-Id: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
Merged-In: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
2024-05-07 09:05:25 +00:00
SongFerng Wang
ceda48c70c Merge "Add the OtherSection for NetworkCellularGroupProvider" into main 2024-05-07 04:58:28 +00:00
songferngwang
8b2305acd4 Add the OtherSection for NetworkCellularGroupProvider
Bug: 338914255
Test: Verified the SIMs UI
Change-Id: I49d5e4126e43054b5d147de15d35805d1e445c38
2024-05-06 10:16:02 +00:00
Chaohui Wang
caaddc87f3 Clean up unused params from SubscriptionAnnotation
Bug: 338904413
Test: m Settings
Change-Id: Ic714066e45bb0050361c8096394929828a871589
2024-05-06 09:57:38 +00:00
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