Commit Graph

875 Commits

Author SHA1 Message Date
Betty Chang
86551e4d9a Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev 2020-04-14 09:22:04 +00:00
TreeHugger Robot
f25450ef48 Merge "Fix indexing error of mobile related controllers" into rvc-dev 2020-04-14 05:04:46 +00:00
changbetty
787c420c73 [Telephony Setting] Add Preferred Network observer for Auto Select Network Mode
Bug: 135469195
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreferredNetworkModeContentObserverTest
      make RunSettingsRoboTests ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I5782ef67e429412ad0d6ad320e91bcdfe9c6b1db
2020-04-13 16:22:37 +08:00
Jason Chiu
1766b3c01d Fix indexing error of mobile related controllers
There were several errors in indexing mobile related sliceable
controllers, which led them not able to display on Panel and as inline
controls in search result.

It's because indexing mechanism is running in a worker thread and trying
to construct each controller instance, but the failed controllers'
constructors need to initilize something in the main thread.

- Give the main looper to the classes which only can be initialized in
  the main thread to fix the indexing.
- Guard null pointer exception in SlicesIndexer after fixing the
  indexing.
- Use onStart/onStop in AirplaneModePreferenceController to start/stop
  listener.

Fixes: 149720345
Test: robotest
Change-Id: Ibe5a8d6cc713eeddf26eceaabc05e6d1faa45507
2020-04-10 10:56:31 +00:00
Bonian Chen
cad93df0a4 [Settings] Avoid rename inactive subscription from NullPointerException
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
(cherry picked from commit 1b71b5e601)
2020-04-10 18:05:17 +08:00
TreeHugger Robot
6e50dfc6ec Merge "[Settings] Add more owner" into rvc-dev 2020-04-10 08:08:30 +00:00
Bonian Chen
ce92b0efb7 [Settings] Add more owner
Add more owner for code review.

Bug: 0
Test: none
Change-Id: Idf49638e4599b95fe39fe127e5b965cf724f5d7c
2020-04-10 13:13:08 +08:00
Calvin Pan
4e2e7bb734 Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev 2020-04-10 02:38:46 +00:00
calvinpan
a971c458ba Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode
Add is5gEntryDisplayed() check in in NETWORK_MODE_LTE_GSM_WCDMA mode to
prevent that show "LTE(recommand)" everytime.

Bug: 153301072
Test: By manual
1. Reproduce issue
2. Verify the patch

Change-Id: I96311a1e399efd160a3f7290f85df778b2d6f0c4
2020-04-08 16:58:56 +08:00
Bonian Chen
05cb60b258 Merge "[Settings] Code refactor" into rvc-dev 2020-04-08 04:52:23 +00:00
Automerger Merge Worker
7ab0499a38 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6
Bug: 146057372

Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
(cherry picked from commit 0577514d0d)
2020-04-07 11:49:41 +00:00
Bonian Chen
1df6c9cdd4 [Settings] Code refactor
Remove unused import

Bug: 10956255
Test: build pass
Change-Id: I256870483d85bf7000556357071834cad24884d1
2020-04-07 19:29:49 +08:00
Bonian Chen
b1c7e21066 [Settings] Core refactor
Remove empty lines, and maintain the comments.

Bug: 150352656
Test: build pass
Change-Id: If0552d7ce20de5941667aa64e682202aaf32c597
2020-04-07 12:09:51 +08:00
Bonian Chen
0d3732a595 Merge "[Settings] Code Refactor" into rvc-dev 2020-04-01 16:07:47 +00:00
Bonian Chen
bd03b17a62 [Settings] Avoid from crash when pull out SIM
Avoid from crash through exception handling.

Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
2020-04-01 12:05:38 +08:00
Bonian Chen
39ff4e4495 [Settings] Code Refactor
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods

Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
2020-04-01 10:58:27 +08:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
Bonian Chen
7520adccee [Settings] Apply WifiCallingQueryImsState
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Bonian Chen
bef5c99802 [Settings] Remove internal ImsManager access within MobileNetworkUtils
Remove the access of com.android.ims.ImsManager from MobileNetworkUtils.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: Id2550a11c185ac44c1f70c98929c4b1d659f9a0c
2020-03-31 09:41:40 +08:00
Bonian Chen
fb7274a308 [Settings] Replace ImsManager#isVtEnabledByPlatform()
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform()
Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
James Lin
a7a3304a20 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev 2020-03-27 09:56:32 +00:00
James.cf Lin
9f8edf2b67 Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type
After setting the network to telephony framework, Setting UI didn't check this network type when show on the UI and show the invalid string.

Bug: 152373426
Test: manual
Change-Id: Ibf280a9905edcb7bd241a1505e85ac5e83993634
2020-03-27 09:54:08 +08:00
Xiangyu/Malcolm Chen
b0a5905d08 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev 2020-03-27 00:24:23 +00:00
Malcolm Chen
b5e7565175 Show footer to notify user no 5G in DSDS mode.
Bug: 151657272
Test: manual and robotests
Change-Id: I5df95528aae12b43a15389b8048f14d9508272f3
2020-03-26 10:31:42 -07:00
Bonian Chen
d412e06c39 [Settings] Change the restart policy for MobileNetworkActivity
Prevent recreating the fragment in MobileNetworkActivity when the
subId is the same.

Bug: 141833767
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I8167781fb462efa310a5d6bac76d880dbc9b6bfc
2020-03-26 17:44:17 +08:00
Bonian Chen
8bbebc03a6 Merge "[Settings] Avoid re-create fragment when subscription not changed" into rvc-dev 2020-03-25 18:33:05 +00:00
Bonian Chen
3d8a4d2484 [Settings] Avoid re-create fragment when subscription not changed
Simply updating the content of fragment instead of re-create it in order
to improve the performance of mobile network page.

Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I744c2d76b814abdb619c8f40c3f113902ad8a827
2020-03-25 23:59:12 +08:00
Zhen Zhang
c37fcd0cb8 Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev
* changes:
  Fix crash in AllInOneTetherSettings when user is not admin
  Refactor new tether settings to remove SharedPreferences
2020-03-25 07:25:07 +00:00
Bonian Chen
806c9d5214 [Settings] Code refactor on MobileNetworkActivity
Apply the behavior of ProxySubscriptionManager into
MobileNetworkActivity.

Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I2d4b12dead7a9ea68cc8e335cd37f22226fe295f
2020-03-25 10:19:40 +08:00
Bonian Chen
dcf701efc3 [Settings] Avoid from Settings crash
Avoid from crash when null pointer.

Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
2020-03-25 05:48:37 +08:00
Zhen Zhang
3b53b80715 Fix crash in AllInOneTetherSettings when user is not admin
When user is not admin, we should skip the setup and tear down
procedures in AllInOneTetherSettings' lifecycle. Also, the switch for
"Hotspot & tethering" on "Network & internet" should be disabled in such
case.

Bug: 151648198
Test: Build and flashed to crosshatch device. Using guest user, the
settings won't crash when using AllInOneTetherSetting and the switch is
disabled.

Change-Id: Ibd2f4111c53b8b9fa6a18504a681a27b966a3c46
2020-03-24 06:58:41 +00:00
Bonian Chen
073f483d86 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
2020-03-24 11:51:23 +08:00
Calvin Pan
861d3446ab Merge "Clear the entries in updateState" into rvc-dev 2020-03-23 10:11:58 +00:00
calvinpan
8c6218013d Clear the entries in updateState
When user select the prefer network type that will also invoke
updateState(), so need to clear the entries to prevent adding duplicate
item.

Bug: 152031192
Test: By manual.
Change-Id: I05c5eae658cf72bdf05f5007b4aeba575ab14d61
2020-03-23 14:09:54 +08:00
Zhen Zhang
7f2d6ce058 Refactor new tether settings to remove SharedPreferences
Bluetooth, USB and Wifi Disable tether preferences will turn on/off that
type of tethering interface instantly without storing it into
SharedPreferences. They are listening to TetherEnabler to update their
state.
Refactored to remove dependancy on SharedPreferences.

Bug: 151367756
Test: TetherEnablerTest; BluetoothTetherPreferenceControllerTest;
UsbTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest; AllInOneSettingsTest;
AllInOneTetherPreferenceControllerTest

Change-Id: Ia6cc60bc4de8f08413beb6d41552a18f6fa6a55b
2020-03-20 13:15:10 -07:00
Bonian Chen
b90fe0b04c [Settings] Apply ImsQueryController#isServiceStateReady to VoLte
Apply ImsQueryController#isServiceStateReady() to VoLte part

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I1535df837f2e015cd1afb0891fd69a98c7d6991a
2020-03-20 23:33:47 +08:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
2020-03-20 10:46:52 +00:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
2020-03-20 13:31:35 +08:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package"
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
2020-03-20 01:37:47 +00:00
Peter Wang
6c95bb5cf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:39 +00:00
Bonian Chen
c073abaf2e Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev 2020-03-19 04:35:39 +00:00
Peter Wang
4aeb063f75 [API Review] APIs in SubscriptionManager
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I7bb9b088f1a08aaac5b43f264a77272aa52d562d
2020-03-18 16:50:31 -07:00
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
2020-03-17 18:27:34 +08:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
2020-03-10 10:23:43 +00:00
Nathan Harold
adbc1ac905 Disable 5G Scanning in NetworkScanHelper
5G has two operating modes: stand-alone and non-standalone.
The vast majority of support is currently for non-standalone
mode. Because Android currently cannot tell the difference
between the supported modes in the modem, and because a device
that supports non-standalone mode shoudn't scan for 5G during a
PLMN selection procedure (it can't camp on 5G, hence non-
standalone mode), disable 5G scans by default and revisit once
modem support exists to distinguish between the two modes. This
avoids alternatives such as allowing 5G to be silently removed
in the RIL or for a 5G scan to be performed which doesn't provide
the user any meaningful options.

A separate bug has been filed (b/151119451) to revisit this logic
once the modem supports interrogation of its 5G capability.

Bug: 149528140
Test: compilation
Change-Id: I4e19b43e6529b5c673bb54c6f8f94c44a7c5bee5
2020-03-09 19:39:56 -07:00
Bonian Chen
613dcd9dfe Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev 2020-03-09 17:13:50 +00:00