Commit Graph

56356 Commits

Author SHA1 Message Date
Treehugger Robot
e30450cd68 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:51:43 +00:00
Bill Yi
821f954a9a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
2020-09-05 01:26:27 -07:00
Treehugger Robot
76947837c5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
2020-09-02 05:05:27 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
2020-08-27 15:56:13 -07:00
Treehugger Robot
e40251b9f5 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
2020-08-19 14:56:13 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
hoffc
291fd9b816 Settings: Fix exception in about phone during SIM swap
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.

Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.

Bug: 159410236

Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
2020-08-18 13:57:55 +08:00
Bonian Chen
af57413abc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
2020-08-14 08:05:12 +00:00
Bonian Chen
33e4971820 Merge "[Settings] Grant permissions to submit junit test" 2020-08-14 07:45:50 +00:00
Bonian Chen
1c97e70641 [Settings] Grant permissions to submit junit test
Grant permissions for adding new Junit test case.

Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
2020-08-13 18:49:31 +08:00
Jackal Guo
e8b8d9917a Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391

Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438 Merge "Revert "[Settings] Refactor PhoneStateListener"" 2020-08-13 08:52:47 +00:00
Jackal Guo
765fb8293d Revert "[Settings] Refactor PhoneStateListener"
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
7903cf872e Merge "[Settings] Refactor PhoneStateListener" 2020-08-13 08:13:25 +00:00
Bonian Chen
e01df59027 [Settings] Refactor PhoneStateListener
Remove Looper and update of mSubId

Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00
Bonian Chen
5c21396034 Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389

Change-Id: Ib8e712b0416e24857b1e2d1203cf22bd12ba4786
2020-08-13 04:43:30 +00:00
Bonian Chen
3b8794d16b Merge "[Settings] Replace getSimCount() API" 2020-08-13 04:27:36 +00:00
Bonian Chen
5560882548 [Settings] Replace getSimCount() API
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
2020-08-13 10:56:55 +08:00
Bonian Chen
86320e5484 Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828

Change-Id: I8cec53b0c426cf73c470db0d763280d13435b257
2020-08-12 08:57:39 +00:00
Bonian Chen
6fe15deeb1 Merge "[Settings] Code refactor for Wifi calling IMS API" 2020-08-12 08:41:29 +00:00
Treehugger Robot
c855a8a21a Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I20645fd922e5908a8911fd7dc975f3ea4e053990
2020-08-12 06:10:58 +00:00
Treehugger Robot
5a19cea4ef Merge "Prevent errors when updating operator pref summary" 2020-08-12 05:54:27 +00:00
Bonian Chen
91412b5069 [Settings] Code refactor for Wifi calling IMS API
Replacing logics of
ImsManager#isWfcEnabledByPlatform() &
MobileNetworkUtils#isWfcProvisionedOnDevice()
into WifiCallingQueryImsState#isWifiCallingProvisioned().

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Merged-In: I68462368669b81e10d09bbb93e74e23ea9a1f446
Change-Id: I26d616f082a4dd3f2cb14defc5f68218f668ad48
2020-08-12 13:43:46 +08:00
Bonian Chen
59dfd94170 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560

Change-Id: I84b5d35b4a9a0ea77597c45b445768bd2782c845
2020-08-12 04:24:57 +00:00
Bonian Chen
60d00b58f3 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" 2020-08-12 04:10:10 +00:00
Bonian Chen
a9a69c6aa3 Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548

Change-Id: I92dbf184a274d3a22ad597bff0b24d2c44218266
2020-08-11 08:26:23 +00:00
Bonian Chen
f116c5fae7 Merge "Override 2 getSliceUri() instance to return platform slice" 2020-08-11 08:05:10 +00:00
Fan Zhang
6c046831de Override 2 getSliceUri() instance to return platform slice
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
2020-08-11 04:24:27 +00:00
Bonian Chen
6cc261d709 Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551

Change-Id: I030d2a19b44d5c5dd91ef07be723f897d0ea057b
2020-08-11 02:45:31 +00:00
Bonian Chen
5c4154b2e4 Merge "Add interface and extend db to support storing slice uris" 2020-08-11 02:23:56 +00:00
Jiashen Wang
889f702829 Change MobileNetworkUtils to use EuiccManager.isSupportedCountry
Currently LPA passed supported/unsupported countries to Settings by
writing the value into properties which is not ideal. Instead, we should
call EuiccManager.isSupportedCountry instead.
Bug: 147674689
Test: 1) Manually tested by flashing the change to the device
2) Change LPA to override onGetIsEuiccSupportedCountry
3) Make sure LPA can get the request

Merged-In: Ib136beea325eabdfbd8a6a843611143958dce603
Change-Id: If406d9d803affa334c1ad4f871fcfdc0561c9bf6
2020-08-10 22:57:02 +08:00
Bonian Chen
8977c4ce49 Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549

Change-Id: Idb1032b0e1513650da785866e85eef4bff64827f
2020-08-10 11:21:00 +00:00
Bonian Chen
7e6c957fea Merge "Show/hide 5G preferred network type also consider allowed_network_type" 2020-08-10 11:07:41 +00:00
Bonian Chen
80b3bb5141 Merge "Remove PreferenceCategory wrapper" am: 75124d794c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552

Change-Id: Ia40d77f7daf669323275aab1b05ba81a14c5f499
2020-08-10 10:31:58 +00:00
Bonian Chen
75124d794c Merge "Remove PreferenceCategory wrapper" 2020-08-10 10:12:14 +00:00
Raff Tsai
91d40cdb21 Remove PreferenceCategory wrapper
- Avoid similiar issue in b/130396913

Bug: 124129485
Test: manual
Merged-In: I6f4698304210bacba5c76020c375dda49330d2cc
Change-Id: I9d5d856f586ab660a5adb17c0bb1f49e90eca198
2020-08-10 17:03:13 +08:00
Fan Zhang
f609df425d Add interface and extend db to support storing slice uris
Bug: 126222433
Test: manual
Merged-In: Ie81e69477d297aa96a0daad02d56196c956271a3
Change-Id: Ifdae6fc47dc078ba83c211d07d6028f00f11e6f2
2020-08-10 16:50:21 +08:00
Josh Hou
abe032ea66 Show/hide 5G preferred network type also consider allowed_network_type
1. The carrier or privileged apps will enable/disable network types on
the device, so Settings references the allowed network type to show/hide
5G preferred network type option.

2. For mainline, copy the getNetworkTypeFromRaf() from RadioFamily to
Settings.

Bug: 136730709
Test: Manual test & EnabledNetworkModePreferenceControllerTest
1. Enable allowed_network_type
2. Disable allowed_network_type
Merged-In: I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5

Change-Id: Id591f454a60d0ba08c3fc4a2ffe40836dafeb5f0
2020-08-10 16:18:36 +08:00
Bonian Chen
caf6ede5f7 Merge "[Settings] Code refactor" am: d1998a6fe8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: Ie2a82c86d1ad63e92bebf69b0f98939a0b33f87e
2020-08-10 07:20:10 +00:00
Bonian Chen
d1998a6fe8 Merge "[Settings] Code refactor" 2020-08-10 07:02:46 +00:00
Bonian Chen
d97cb511ac Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I252c98b9f0f17c42cd8b38d724a68d22db3626ca
2020-08-10 06:10:02 +00:00