Commit Graph

640 Commits

Author SHA1 Message Date
Automerger Merge Worker
778653fe71 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f am: 737783d5e4
Change-Id: I392268bd41ff76960107f137ae10ebf3dd151170
2019-12-23 03:04:51 +00:00
Automerger Merge Worker
737783d5e4 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f
Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb
2019-12-23 02:51:48 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
2019-12-23 01:00:38 +00:00
Jayachandran Chinnakkannu
08e1aaf3f2 Merge "Settings: Remove usage of hidden APIs" 2019-12-19 18:38:08 +00:00
zoey chen
20f67e1b33 [Settings] Cannot use UnsupportedAppUsage API, use appropriate method to replace it.
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
2019-12-19 17:35:38 +08:00
Betty Chang
44aa082c24 Merge "[Mainline] Use SystemApi setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId" 2019-12-19 03:25:16 +00:00
changbetty
9b7b185da4 [Mainline] Use SystemApi setDefaultVoiceSubscriptionId instead of setDefaultVoiceSubId
Bug: 146309719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I0ebc90f9d86a3123e86f40fd17f0be584964b4c6
2019-12-19 02:09:03 +00:00
Bonian Chen
b212076d60 Merge "[Settings] Unable to display disabled SIM" 2019-12-18 10:41:23 +00:00
Automerger Merge Worker
268595f26a Merge "[Settings] Create a proxy for SubscriptionManager" am: b2380eaaee am: 73e6ec3231
Change-Id: Iafb4bf54ea21d88867b675bb71bf7eb1fec5bf06
2019-12-18 09:21:56 +00:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
Bonian Chen
2716dd18bb [Settings] Unable to display disabled SIM
Disabled p(e)SIM should be allowed to display to the user.

Bug: 144172733
Test: Manual
Change-Id: I6825fde8ffb22bc95d6c50a60bdeb8027a2f93b8
2019-12-18 16:44:42 +08:00
TreeHugger Robot
1247fd8736 Merge "Create a TetherEnabler class to manage tether settings switch" 2019-12-18 03:13:38 +00:00
Automerger Merge Worker
0ed1383af2 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" am: ecce39622d am: 2be27a8d81
Change-Id: Ia5c3e5043d885812fa013caa7b0786819ec81e5c
2019-12-18 01:53:32 +00:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00:00
Zhen Zhang
23e8fa1020 Create a TetherEnabler class to manage tether settings switch
This class is created to manage the switch state of overall tethering
state. It can turn on/off each type of tethering based on stored value
in SharedPreference. Also, it listens to data saver state change.

Bug: 145923107
Test: TetherEnablerTest
Change-Id: I7f360329569f53f34cf13065aa0e00ad9b55f659
2019-12-17 12:46:55 -08:00
SongFerngWang
c13da87416 [mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1e9eeab9d886a2910c7db8b59cfe267c51c5920c
Merged-In: I1600a96a729fc3b555eab5bc80b069663c8eb00a
2019-12-17 12:19:52 +00:00
SongFerng Wang
b222676505 Merge "[mainline] decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-17 12:18:19 +00:00
Xiangyu/Malcolm Chen
e0f40d5948 Merge "Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId" 2019-12-17 01:59:43 +00:00
Jayachandran C
d5df7b9655 Settings: Remove usage of hidden APIs
This CL uses TelephonyManager instead of TelephonyIntent for
ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS

Bug: 146240041
Change-Id: I45bf3295badb49a571ab13fea2c6218768533835
2019-12-16 16:52:25 -08:00
Alex Lin
62487aed51 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev-plus-aosp 2019-12-16 21:34:45 +00:00
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
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