Commit Graph

3255 Commits

Author SHA1 Message Date
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
Chaohui Wang
57956a8bb8 [Apn] Copy network type into lingering network type
The lingering network type is actually the bit that controls network
torn down. UNKNOWN here means the APN can work on any RAT.

Just copy network type into lingering network type, so network torn down
can work normally.

Fix: 341006308
Test: unit test
Change-Id: Ia60ad3e012bec7364aa35535de1363cd7c0ccdda
2024-06-04 13:58:36 +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
Treehugger Robot
5b754d0428 Merge "Avoid flaky test fail due to no Subscription service." into main 2024-05-30 13:02:58 +00:00
tomhsu
27d2115eaf Avoid flaky test fail due to no Subscription service.
Fix: 340875634
Test: atest passed
Change-Id: Id922ace830f25dd730cad2d8aa19177988b6670d
2024-05-30 11:14: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
Chaohui Wang
942622575a Disable "Reset app preference" during call
Reset app preference will dismiss all the notification, disable
"Reset app preference" during call so in call notification not get
dismissed.

Fix: 342627537
Test: manual - try "Reset app preference" during call
Change-Id: Ida9961ca30dc80c05d4de5bc9faac3203967f3d3
2024-05-30 05:44:14 +00:00
Tom Hsu
c3e9cd5969 Merge "Fix Crash due to runtime exception from CarrierManager" into main 2024-05-29 06:38:30 +00: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
SongFerng Wang
b462f9fa11 Merge "The pages of sim onboarding flow is wrong." into main 2024-05-28 19:58:55 +00:00
David Jacobo
7b986e7e45 Merge "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS"" into main 2024-05-28 19:38:10 +00:00
songferngwang
98efa51681 The pages of sim onboarding flow is wrong.
Switch from SS mode to DSDS mode, the esim status will use the last
status. It causes the condition of page selection is wrong.

Bug: 342972402
Test: atest SimOnboardingPageProviderTest
Change-Id: I8bb0b5f2802ec24f10467bac179ce54d13a9755e
2024-05-28 08:47:23 +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
David Jacobo
1377be2323 Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS"
Revert submission 27019285-ACTION_NETWORK_PROVIDER_SETTINGS

Reason for revert: b/338527563 CL seems to be introducing jank for systemui tests somehow, reverting to get out of the way

Reverted changes: /q/submissionid:27019285-ACTION_NETWORK_PROVIDER_SETTINGS

Change-Id: I48bc0f4efc22dbff9f983b4606442b3ebd6d584c
2024-05-25 05:30:22 +00:00
Chaohui Wang
2faad6df6e Check APN type is selected before save
Not allow save APN without type.

Fix: 340969975
Test: manual - APN Settings
Test: unit test
Change-Id: I91f8e8137fc234c9c860fd446b7a1e2acfa11fc7
2024-05-24 14:58:42 +00: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
a848c57633 Merge "Remove the java doc" into main 2024-05-23 19:21:05 +00:00
SongFerng Wang
392fb96dfc Merge "Add the Primary IMEI" into main 2024-05-23 19:20:32 +00:00
songferngwang
15991cc948 Remove the java doc
Bug: 331222033
Test: build pass
Change-Id: I0953dbaf68eb78ff665cf4b46c65bcc4967a60a8
2024-05-23 12:40:22 +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
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