Commit Graph

21572 Commits

Author SHA1 Message Date
tomhsu
1f440aacec Show dialog on BT entries in Settings
- When satellite mode is switched on BT entries shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: Ic9b6d44731684d1cfba87570d72dcacb905a66d2
(cherry picked from commit c8f52f816c)
Merged-In: Ic9b6d44731684d1cfba87570d72dcacb905a66d2
2024-05-09 06:55:02 +00:00
Treehugger Robot
eb729f283c Merge "Fix flicker of "App data usage"" into 24D1-dev 2024-05-09 05:50:55 +00:00
Chaohui Wang
bb90a2c5c8 Merge "Fix data usage when policy has no cycle" into 24D1-dev 2024-05-08 08:33:18 +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
Chaohui Wang
107cca7a77 Fix data usage when policy has no cycle
Fallback to four weeks, as the same as no policy.

Fix: 336108815
Test: manual - on DataUsageList
Test: unit test
Change-Id: I63140a13ea3f3ee790cc911432fbdfd6247f7318
2024-05-07 14:22:35 +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
Pajace Chen
df8dc5dc61 Merge "Fix test case failed issue" into 24D1-dev 2024-05-03 02:08:09 +00:00
pajacechen
1d03a55ea8 Fix test case failed issue
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.

Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
2024-05-03 01:59:40 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +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
Chaohui Wang
f97e76bc3f Fix SubscriptionInfoListViewModelTest
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
(cherry picked from commit 10f5bdabb4)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-04-30 03:32:08 +00: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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
f02cfc9526 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-17 17:30:24 +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
Pajace Chen
d9b44a8b9c Add charging string V2 for settings
Apply charging string V2 for settings

Bug: 328546483
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f3c97f60a966a8ec357ba4d15b19d9d7a04b34d)
Merged-In: Ic68bf4231da81d865faa285bca97a929abe26a42
Change-Id: Ic68bf4231da81d865faa285bca97a929abe26a42
2024-04-12 06:23:55 +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
Song Chun Fan
844d2f4c67 [Settings/Archive] remove all checks for the archiving system property
No longer needed

BUG: 331165939
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ae958abd26ed77ecd4d3fb1720bb912553da2ea)
Merged-In: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
Change-Id: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
2024-04-09 18:08:41 +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
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
Treehugger Robot
214646a032 Merge "Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC." into 24D1-dev 2024-04-01 21:56:24 +00:00
Rafael Higuera Silva
496075f1be Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC.
Test: make, manually test, atest com.android.settings.network, atest SubscriptionUtilTest
Bug: 328649505
Change-Id: I0c6fb7b5407179ec6850ece47f486b64759e2d1c
(cherry picked from commit 9ac44b3aae)
2024-03-24 23:46:53 +00:00
Andy Wickham
9aa1c402ae Allows for system navigation settings to be added dynamically.
This allows for controller-backed preferences to be added or
overridden via xml.

Similarly, if the controllers cause all of the preferences for
2 or 3 button nav to be unavailable, we hide the settings button.

Bug: 324036308
Test: Manual and unit tests
Flag: NA
Change-Id: I2371f3173076172489966728ac69c8767570cd56
Merged-In: I2371f3173076172489966728ac69c8767570cd56
2024-03-21 20:31:06 +00:00
George Chang
1df6f6a976 Merge "Revert "settings(dev): Remove NFC stack logging control"" into 24D1-dev 2024-03-19 05:06:34 +00:00
Chaohui Wang
67579d564b New countryIfOriginLabel
And display this label as fallback when Regulatory Image is missing.

Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
Merged-In: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 09:23:31 +00:00
George Chang
b5d57eaa58 Revert "settings(dev): Remove NFC stack logging control"
This reverts commit a5bd1cf34f.

Bug: 329776725
Test: manual turn on/off debug logging.
Merged-In: I3c6026e230c7d35f04d9771442fadbf040a84b94
Change-Id: Ica004bb5f22636777287acfe1226b0f6a650d4f7
2024-03-15 05:55:41 +00:00
Wilson Wu
7fe0754011 Fix keyboard vibration settings delay
The default settings observer delay is 10s for
background service. It cause the apps get the
settings update delay and lead a unsync behavior.

Update the settings change without delay.

Bug: 327094397
Test: Manual test with bug steps
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
(cherry picked from commit f2174611b8)
Merged-In: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
2024-03-14 02:40:12 +00:00
Jacky Wang
081dbac72e Reset app preferences does not trigger backup for App battery usages
Bug: 328712606
Fix: 328712606
Test: UT && Verify logcat when change/reset App battery usages
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ef8a51fac85eedee8f9509b9f7c002281c1ae093)
Merged-In: Ia3917c8dc2654185f5f048c048362fd47379b7d1
Change-Id: Ia3917c8dc2654185f5f048c048362fd47379b7d1
2024-03-13 03:23:50 +00:00
Wilson Wu
81f2587fd4 Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-08 11:22:34 +00:00
Graciela Wissen Putri
a0f573a35e Follow config overlay's order of aspect ratio options
Fix flaky UserAspectRatioAppsPageProviderTest by using advanceUntilIdle
to make sure all coroutines are finished before asserting.

Bug: 325911424
Test: atest UserAspectRatioDetailsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32815ad699448c5c5b1f38df6d2d2a881d4251c1)
Merged-In: I83e9a7f31536c1a006789722b0310f3364d14337
Change-Id: I83e9a7f31536c1a006789722b0310f3364d14337
2024-03-05 17:11:59 +00:00
SongFerng Wang
71c6c3e557 Merge changes I96574a79,I74681222 into main
* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
2024-03-04 12:27:37 +00:00
songferngwang
c9a3eeb792 Fix the testcase failed
Add mock for SubscriptionManager.createForAllUserProfiles

Bug: 323652989
Test: atest MobileNetworkPreferenceControllerTest
Change-Id: I96574a79eba581db95d387f0d9c9fde2e004c41c
2024-03-04 10:58:22 +00:00
SongFerng Wang
d94a556939 Merge "Fix SimDialogActivityTest" into main 2024-03-04 08:48:11 +00:00
Angela Wang
6089d3edd6 Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main 2024-03-04 06:53:19 +00:00
Jacky Wang
16a99aecae Merge "[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage" into main 2024-03-04 03:58:29 +00:00
Weng Su
1a2d60a867 Merge "Ignore failed Wi-Fi unit tests" into main 2024-03-04 03:47:47 +00:00
Weng Su
777157b5b4 Ignore failed Wi-Fi unit tests
Bug: 323645528
Flag: None
Test: unit test
atest -c SettingsUnitTests:RequestToggleWiFiActivityTest \
         SettingsUnitTests:WifiDialog2Test \
         SettingsUnitTests:WifiUtilsTest

Change-Id: I8d3ddb1eb775b8758cb359cac4dac39bb9c8dfed
2024-03-04 06:07:40 +08:00