Bonian Chen
00e8b63d0f
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours am: 8eb932b5b1
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
2020-08-13 09:25:07 +00:00
Bonian Chen
8eb932b5b1
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I22f62a4e0a0474cf9ead4d1ed38090b28bf0b243
2020-08-13 09:14:05 +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
Bonian Chen
7903cf872e
Merge "[Settings] Refactor PhoneStateListener"
2020-08-13 08:13:25 +00:00
Bonian Chen
bdd022172e
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: Ibb972bf5b76ae57ff451fe2ee65d312fcf388956
2020-08-13 05:14:59 +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
ce259b61f6
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf
2020-08-13 04:57:28 +00: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
Lucas Dupin
5f44b7cf54
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I607edce1f3981b4b8882bea1530362980a280de9
2020-08-12 21:50:32 +00:00
Lucas Dupin
e899f749a1
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev
2020-08-12 21:27:45 +00:00
Bonian Chen
c120b09dcc
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours am: 8dfe7ea127
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I094d14db59d3bacd0dc84548034c6c4f6e6e20a5
2020-08-12 09:35:29 +00:00
Bonian Chen
8dfe7ea127
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I4320c9249fbbae470bb5b320cd9fde425a2c8828
2020-08-12 09:15:35 +00: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
43cff6baff
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
am: 455d7924c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: I4721d6a74d655fca65f7a95ee996d3421581871e
2020-08-12 06:46:58 +00:00
Treehugger Robot
455d7924c4
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: Ibdb29f86401439a66c9aa3a456454e6caadddffa
2020-08-12 06:26:47 +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
db8bd6ac06
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: I2a0c58e8bca107541ae83985eba12f2b58ce4d59
2020-08-12 05:08:39 +00:00
Bonian Chen
8c8761b74e
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: Idf79d9aa5960948943959c262a01d4c3f7d3c97a
2020-08-12 04:42:00 +00: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
6e8d241cd9
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours am: 17a4871845
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: I16c99ac5fe38cb7391858d02abd4b21539d6d032
2020-08-11 08:57:21 +00:00
Bonian Chen
17a4871845
[automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7
am: a9a69c6aa3
-s ours
...
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548
Change-Id: Ifda29d94ccdae085264cf14d4b8064db055b4ea2
2020-08-11 08:37:45 +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
41a77501c3
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours am: e8c233c4dc
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I4e6af4b49d9e9649a790f32a72ccb8b6d5d138c5
2020-08-11 03:18:30 +00:00
Bonian Chen
e8c233c4dc
[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4
am: 6cc261d709
-s ours
...
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551
Change-Id: I15340b9727806d93ad352c154e0b7ed6d16d9def
2020-08-11 02:58:33 +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
TreeHugger Robot
f90d25620d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12341404
Change-Id: Ic77a45f1573b50befe00545853cf774ade34f7fa
2020-08-10 17:16:16 +00:00
TreeHugger Robot
1419ef2874
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-10 17:03:22 +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
06b5916f4f
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours am: 528b77a6e3
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: I468782ddc0c2afd6e353194c051fd5a6508c1b30
2020-08-10 12:02:02 +00:00
Bonian Chen
528b77a6e3
[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours
...
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: If755e66d86fb32a43a36c74a2bf37e94694f7fa4
2020-08-10 11:43:42 +00: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
db42e97e81
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours am: cfe7584cec
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I235aaed5dce0a37f429db30ffb6b16a417a8f94d
2020-08-10 11:09:23 +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
cfe7584cec
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours
...
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552
Change-Id: I012950d0a764a1655ca06e89dd9e98962f386a17
2020-08-10 10:52:15 +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
f774cdf0ee
[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8
am: caf6ede5f7
-s ours am: a3e98a699e
-s ours
...
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366
Change-Id: I81d83289d2daf8a13677c0aba58e81cfcb587656
2020-08-10 07:57:03 +00:00
Bonian Chen
a3e98a699e
[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8
am: caf6ede5f7
-s ours
...
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366
Change-Id: Ia52ca5268d3eaa380df4e5eb90329cd7210aade9
2020-08-10 07:36:17 +00:00