Commit Graph

926 Commits

Author SHA1 Message Date
Bonian Chen
0b1cc9979e Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
Change-Id: I06dcc9e2304a4fdb04ce9ba1dd30fb96e8045a2d
2020-04-01 16:19:07 +00:00
Bonian Chen
0d3732a595 Merge "[Settings] Code Refactor" into rvc-dev 2020-04-01 16:07:47 +00:00
Bonian Chen
d9f98f935b Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
2020-04-01 07:17:07 +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
ddb2495761 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154
Change-Id: I4eee2d80449cb4680fd8f4003093658140e32ac4
2020-03-31 16:27:10 +00:00
Bonian Chen
17cd51e9eb Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3
Change-Id: I798948b3ffe73b9830c12eb473e40beee0ceef57
2020-03-31 16:27:08 +00: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
89440ab287 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308
Change-Id: Icd17e13882d838ca7629474d5abd29ac27c5c9d9
2020-03-30 08:31:19 +00: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
89e418e12f [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4
Change-Id: I5423d09d50bf76947e41927f9138e7db34f963a7
2020-03-30 04:23:47 +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
24c06447db Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20
Change-Id: I8a5a565e71981e4faa323f82424c927783d42e06
2020-03-27 10:14:05 +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
0e4d8aa531 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
Change-Id: Id7cec642292dab8ec19bb33ab8247d7f3b0d2865
2020-03-27 00:44:30 +00: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
e8bfc75f22 Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
Change-Id: Ie50623f8d49b5acd37b872f65033f34376125a69
2020-03-26 09:53:59 +00: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
c47a9795a7 Merge "[Settings] Avoid re-create fragment when subscription not changed" into rvc-dev am: 8bbebc03a6
Change-Id: Ic58bf0651cbb3736679473716d6b2b3e51d745bd
2020-03-25 18:51:47 +00: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
e3892d4d8d Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8
Change-Id: Ieb2d2f950d9d6f43ba712d2220d5e66d9b1d5beb
2020-03-25 07:42:49 +00: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
fdca269a5e Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
Change-Id: I11095d23554c38e431bef78aee0665853367a8dd
2020-03-25 04:42:03 +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
TreeHugger Robot
d169749e7d Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
Change-Id: I2fb1ee5ab5f737660676b27062b89329e9cedf81
2020-03-24 23:47:44 +00: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
Bonian Chen
0a5211a6d5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98
2020-03-24 07:15:24 +00: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
70218097f4 Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab
Change-Id: I67ac551c8498d9029a0c61ef7d1672fae0f2b18f
2020-03-23 10:23:56 +00:00
Calvin Pan
861d3446ab Merge "Clear the entries in updateState" into rvc-dev 2020-03-23 10:11:58 +00:00
Bonian Chen
3ca9e69e2b Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
2020-03-23 06:36:27 +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
be71dbdda7 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1
Change-Id: I218e2a34c62eaef6307475d1c5add31d3ff9ded4
2020-03-20 11:01:52 +00:00
Bonian Chen
e495a049c4 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e
Change-Id: Ia9cef50655182a53cae97115708490848974b78e
2020-03-20 11:01:48 +00: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
9c35cfa688 Revert "access system resources with android.R package" am: 253ba4f3ef
Change-Id: I78a68e8eef3b3cee9911cb89a9bd09ce83020357
2020-03-20 04:58:39 +00: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
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package"
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404: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
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
2020-03-20 01:37:30 +00:00
Peter Wang
e85186f38e Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
2020-03-19 20:16:15 +00:00