Commit Graph

1771 Commits

Author SHA1 Message Date
Malcolm Chen
26e5dbdbfd Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId
Bug: 140908357
Test: build
Change-Id: Idaa206c7659717a269738c0121a31d957f7d90d0
2019-12-16 11:43:00 -08:00
Automerger Merge Worker
79c698f801 Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd am: 0871f6bc97 am: 0419bccadc
Change-Id: I09b6f3bb2990d0b13c9cb58e4bfd7ad12d4178cd
2019-12-16 14:36:25 +00:00
Automerger Merge Worker
0419bccadc Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd am: 0871f6bc97
Change-Id: I992dfff13cca63e070a74066a78b53fb8fefe01d
2019-12-16 14:23:54 +00:00
Treehugger Robot
90544355cd Merge "[Settings] Remove access of TelecomManager.from()" 2019-12-16 13:04:24 +00:00
Bonian Chen
3a96d214d3 [Settings] Remove access of TelecomManager.from()
Replace TelecomManager.from() into public API access.

Bug: 146187127
Test: build pass
Change-Id: Id9fa32063a9a7ea5b9107315e50330fa5eca41b7
2019-12-16 08:48:05 +00:00
SongFerngWang
6f4ceba6ed [mainline] decouple ServiceState.bitmaskHasTech and getBitmaskForTech
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1600a96a729fc3b555eab5bc80b069663c8eb00a
2019-12-16 16:33:49 +08:00
Automerger Merge Worker
107cd136a3 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Bonian Chen
74c6ceed24 [Settings] Create a proxy for SubscriptionManager
There're many access from Settings app to SubscriptionManager.
Lots of them are checking for similar information.
Create a proxy can reduce the number of inter-process access from
Settings app to SubscriptionManager, and improve Settings app's
UI performance.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=GlobalSettingsChangeListenerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Change-Id: I3591c478045500a97245955767a7ddd5d361da77
2019-12-16 16:26:40 +08:00
Automerger Merge Worker
11fa77b023 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
Bonian Chen
c5f3951970 [Settings] Unable to display disabled SIM (part 2)
1. Disabled SIMs are accessed through getAvailableSubscriptionInfoList()
API.
2. Support of DSDS enable/disable runtime change intent detection
3. Add support for AutoCloseable

Bug: 144172733
Test: Manual
Change-Id: Ibce65c854aee2ae07ca94cbdd4bd2ce656f5f2c8
2019-12-13 14:32:56 +00:00
Bonian Chen
3b85a17840 Merge "[Settings] Enabling first stage of threading" 2019-12-13 14:03:31 +00:00
Bonian Chen
3e747559f8 [Settings] Enabling first stage of threading
Settings app would move PreferenceController to run
in background thread in the near future.

To support this, change some of the design within these
essential components to allow:
1. Handler to run on non-main thread
2. Minimum multi-thread reentrance support

Bug: 146045802
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=GlobalSettingsChangeListenerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Change-Id: Ica5c942b919007d7d260feee632752d3353a6f18
2019-12-13 20:43:25 +08:00
Automerger Merge Worker
ac838cd258 Merge "[Settings] Avoid access Controller from Slice" am: 5fb5d21b2d am: 9901d4262a am: 0e92e71139
Change-Id: I1773f81561c53e1a69204e2c3d58a00c16ff5f09
2019-12-13 08:34:33 +00:00
Automerger Merge Worker
0e92e71139 Merge "[Settings] Avoid access Controller from Slice" am: 5fb5d21b2d am: 9901d4262a
Change-Id: I842ec0be059ce9c2ee09ea80a344beeb071cfa22
2019-12-13 08:25:51 +00:00
Bonian Chen
9d49e1b51f [Settings] Avoid access Controller from Slice
AirplaneModePreferenceController is designed to be run in UI thread.
However, MobileDataSlice is designed to be run in SliceProvider.

Accessing AirplaneModePreferenceController within SliceProvider which
create a possibility of crash.

Bug: 145689275
Test: manual
Change-Id: Ic9eee407917a94c7247feb3afc709d4642cd9900
2019-12-13 13:34:12 +08:00
Alex Lin
f413cfed26 [DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

(cherry picked from commit 3844ba1259)

Change-Id: I4133e38ba2a979dc0bff4ca5090004ccc9f7a757
2019-12-11 01:34:37 +00:00
Alex Lin
d4420d4ce4 [DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

Change-Id: Ic03abd0d2706b7bb9fdc56be7906411b731b186b
2019-12-11 00:15:48 +00:00
Xiangyu/Malcolm Chen
1d8158fc0b Merge "Add disable pSIM option in Settings" 2019-12-09 22:30:06 +00:00
Malcolm Chen
e5dcd02f4c Add disable pSIM option in Settings
As we start disabling pSIM option in R, we check that if the feature is
supported, add the "Use SIM" toggle back to pSIM page.

Bug: 141018421
Test: manual test
Change-Id: I1af497ce5ede93f823825718b8136ff8ae0ab49c
2019-12-06 13:20:06 -08:00
Alex Lin
d3d2af130b Merge "Add country blacklist support" 2019-12-05 23:37:05 +00:00
Sarah Chin
00649c664e Merge "Add NGRAN" am: 4ff75ef786
am: 48388d0949

Change-Id: I131d35236c4fab49ea1a407479b7d75718399c62
2019-12-05 13:56:01 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Alex Lin
3844ba1259 Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested

Change-Id: Ic03abd0d2706b7bb9fdc56be7906411b731b186b
2019-12-04 14:00:18 -08:00
Sarah Chin
bf7ee4a861 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 09:16:04 -08:00
Sarah Chin
721084c310 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 00:15:49 +00:00
Bonian Chen
9b26611ce1 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 am: 944689abd6
am: 6c1861b3c0

Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
2019-11-28 07:30:09 -08:00
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Yi-Ling Chuang
430c16c012 Make some existing slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I5934e89bc1b268fdd44acd630621fa46987728ff
2019-11-28 14:32:15 +08:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
2019-11-27 14:35:07 +01:00
Bonian Chen
8efd95c413 Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
am: d7f0fb6cc1

Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-22 20:38:13 +00:00
Bonian Chen
821a1259e7 [Settings] Fix conflict of AOSP merge
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
2019-11-22 02:36:11 +00:00
TreeHugger Robot
bc78c3e9da Merge "Refactor common layout" 2019-11-21 08:06:28 +00:00
timhypeng
456285ca5b Refactor common layout
- reuse preference_widget_dialog_radiobutton

Bug: 144746899
Test: manual
Change-Id: Icfba629eb05b9db1dc6802e26c087b30f0fe88ed
2019-11-21 10:42:26 +08:00
Bonian Chen
6317a112ea [Settings] Fix unable to accessing Fi
1. Get subscription ID from intent
2. Application context for proxy SubscriptionManager (since this is singleton)

Bug: 144172733
Test: Manual
Change-Id: I2f49d55da3380adeb40e8ff9414057113cb4ac35
2019-11-19 13:26:04 +00:00
Hunter Knepshield
b0b539946f Merge "Synced the code from master branch" am: 64efbe1240
am: 418ef9973e

Change-Id: I430b9c45d007de822c87733b1eb4fc71b36ff23c
2019-11-15 10:54:38 -08:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch"
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
2019-11-15 10:45:58 -08:00
Bonian Chen
21361e1f84 [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

Change-Id: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
2019-11-15 16:01:51 +08:00
Bonian Chen
66d9e08e34 Merge "[Settings] Remove isWfcProvisionedOnDevice API" 2019-11-15 03:00:14 +00:00
Bonian Chen
43fa3a0140 Merge "[Settings] Replace VT and VOLTE provisioning API" 2019-11-15 02:57:29 +00:00
Bonian Chen
7f88b51851 Merge "[Settings] Remove PhoneStateIntentReceiver" 2019-11-15 02:57:01 +00:00
Sunny Shao
f3865e9264 Synced the code from master branch
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
Bonian Chen
65817204e6 [Settings] Replace VT and VOLTE provisioning API
Replace isVtProvisionedOnDevice() and isVolteProvisionedOnDevice()
by android.telephony.ims.ProvisioningManager.

Bug: 140542283
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelper
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceController

Change-Id: Ie92794b794a6b9f2d9e161ca5f328cd9fa01064a
2019-11-14 18:24:55 +08:00
Bonian Chen
2aafbd38e7 [Settings] Remove isWfcProvisionedOnDevice API
Replace isWfcProvisionedOnDevice() by IMS's ProvisioningManager.

Bug: 140542283
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkUtilsTest

Change-Id: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
2019-11-14 18:22:02 +08:00
Bonian Chen
5980b80adc [Settings] Remove PhoneStateIntentReceiver
1. Replace PhoneStateIntentReceiver by adopting PhoneStateListener
2. Replace TelephonyProperties.in_ecm_mode() by
TelephonyManager.getEmergencyCallbackMode()

Bug: 144331663
Test: Manual
make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModePreferenceControllerTest

Change-Id: I95c80d9857c9ca44deede7105e1c200d729fefd3
2019-11-14 04:37:12 +00:00
Bonian Chen
bb53dd5f93 [Settings] Remove access to getSimOperator() API
Replace getSimOperator() by having SubscriptionInfo
from getAccessibleSubscriptionInfo().

Bug: 144263441
Test: Manual
make RunSettingsRoboTests -j ROBOTEST_FILTER=ApnEditorTest

Change-Id: I25cc9dc0912564b8d6f8b23b53f3eb20a51eea32
2019-11-13 17:33:08 +08:00
Bonian Chen
63f837e6dc Merge "[Settings] Replace getSimCount() API" 2019-11-13 06:45:55 +00:00