Commit Graph

535 Commits

Author SHA1 Message Date
Bonian Chen
cd4113ba5c Merge "[Settings] Remove access to getSimOperator() API" 2020-01-07 18:06:40 +00:00
Bonian Chen
1a3ed7a560 Merge "[Settings] Remove PhoneStateIntentReceiver" 2020-01-07 16:21:01 +00:00
Bonian Chen
7d31f16e0f [Settings] Remove access to getSimOperator() API
Replace getSimOperator() by having SubscriptionInfo
from ProxySubscriptionManager#getActiveSubscriptionInfo().

Bug: 144263441
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ApnEditorTest
Change-Id: I132b352dfb50a9cd3a2ddd21b347177ac0332740
Merged-In: I25cc9dc0912564b8d6f8b23b53f3eb20a51eea32
2020-01-07 12:44:30 +00:00
Bonian Chen
e520ec60aa [Settings] Remove PhoneStateIntentReceiver
1. Replace PhoneStateIntentReceiver by adopting PhoneStateListener
2. Replace TelephonyProperties.in_ecm_mode() by
TelephonyManager.getEmergencyCallbackMode()

Bug: 144331663
Change-Id: Ib127cb165c65f50851c4390b05a16dfb8024fab1
Bug: 145830780
Test: Manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModeEnabler
Merged-In: Ib39ab1881484f65bc5a3834b2828c6ba98198cca
2020-01-02 18:26:21 +08:00
Bonian Chen
b14af41430 [Settings] Correct spelling in source code
Rename mSubsciptionsMonitor into mSubscriptionMonitor.

Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
2019-12-30 10:27:57 +08:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Bonian Chen
b373aeedfe [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
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00
zoey chen
fc3ddb2f16 [Settings] Replace #getServiceStateForSubscriber with #getServiceState
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-26 17:12:42 +08:00
Zoey Chen
171eabcb2d Merge "[Settings] Replace #getSimCount with #getActiveModemCount" 2019-12-26 03:44:47 +00:00
Bonian Chen
98e6ab358b Merge "[Settings] Replace TelephonyManager#from()" 2019-12-26 03:36:09 +00:00
zoey chen
5b336b1bd9 [Settings] Replace #getSimCount with #getActiveModemCount
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 16:30:25 +08:00
changbetty
b7c8404317 [Mainline] Remove unused UiccController object
Bug: 146842199
Test: make
Change-Id: I35f86ee24c0db2599924fb470537b860c9d08390
2019-12-25 02:50:01 +00:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
2019-12-23 15:44:52 +08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-12-23 12:40:07 +08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +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
zoey chen
d7eb8113c7 [Settings] Remove usage of TelephonyManager getDefault() hidden API
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
Mergde-In: I818848b0ae323efe8b890cde9d9819d9a606f96d
2019-12-19 19:45:59 +08:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00: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
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
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
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
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
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 09:16:04 -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
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
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
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch"
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
2019-11-15 10:45:58 -08: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
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
2019-10-30 11:49:56 -07:00
Josh Hou
e2cdd74174 Fix ViLTE is not available when WiFi Calling is disabled
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
2019-10-28 11:12:49 +00:00
SongFerngWang
10d41f52b7 Preferred network list add 5G item
am: 76422cab68

Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
2019-10-14 00:34:10 -07:00
Bonian Chen
b36ff74ac3 [Settings] hide preferred network mode UI
am: 92eb42c69e

Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
2019-10-14 00:33:34 -07:00
SongFerngWang
76422cab68 Preferred network list add 5G item
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.

Bug: 138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass

Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
2019-10-14 05:01:09 +00:00
Bonian Chen
92eb42c69e [Settings] hide preferred network mode UI
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.

Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
      atest EnabledNetworkModePreferenceControllerTest
      Manual with AT&T SIM card in out of servce and in service

Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-10-14 05:00:52 +00:00
Antony Sargent
aa88b8cee6 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-10-14 04:59:03 +00:00
Bonian Chen
f726a31457 Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
am: 556b34d03d

Change-Id: Ibffb60c57aa4152b4681f3fe95dae7175f2e878e
2019-10-01 19:53:31 -07:00
Bonian Chen
c7c84d2c87 [Settings Telephony] Carrier name API replacement
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().

TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.

Bug: b/140443508
Test: Manual testing
  atest MobileNetworkUtilsTest
  atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
2019-10-01 17:59:43 +00:00
Paul Hu
67fe04814d Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7 am: 3a728ae13b
am: a6dadc465b

Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
2019-10-01 03:15:14 -07:00
Paul Hu
a6dadc465b Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7
am: 3a728ae13b

Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
2019-10-01 03:09:15 -07:00
Paul Hu
3a728ae13b Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
am: a67ca4cfd7

Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
2019-10-01 03:03:36 -07:00
Paul Hu
a67ca4cfd7 Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" 2019-10-01 09:50:28 +00:00
Taesu Lee
1c20ea5644 Merge "Fix to show eUICC preference in eng build" am: e825c30137 am: 9e81a2f4a8
am: c4c8f51bb0

Change-Id: I58dae46adec67c855a5e26542d75d15f116c37dc
2019-09-25 23:28:11 -07:00