Commit Graph

1677 Commits

Author SHA1 Message Date
Automerger Merge Worker
30d7fd79c9 Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
2020-02-04 02:55:31 +00:00
Bonian Chen
1b71b5e601 [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
2020-02-04 10:47:33 +08:00
Betty Chang
cc9aef705a Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" 2020-02-04 02:44:15 +00:00
TreeHugger Robot
6068d12752 Merge "Use feature flag to show/hide AllInOneTetherSettings" 2020-02-03 08:32:29 +00:00
Bonian Chen
319cc7bc1c [Settings] Add ImsQueryProvisioningStat for VT
1. Code refactor
2. Add ImsQueryProvisioningStat class for VT's use case

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: I40ec5df00d02e71cb8ae78d4f81c71c5e354515a
2020-02-03 14:26:11 +08:00
TreeHugger Robot
d4f33b1e26 Merge "Mainline remove hide api SubscriptionInfo.getCardString" 2020-02-01 06:45:02 +00:00
Bonian Chen
86272795f3 Merge "[Settings] Avoid non-owner from crash mobile data settings" 2020-02-01 05:00:03 +00:00
Automerger Merge Worker
49cd1555f3 Merge "access system resources with android.R package" am: ef77c1d67f
Change-Id: I663f693f498e3566deb37f6175fc0bb214264118
2020-01-31 15:55:52 +00:00
SongFerngWang
5189dc3860 Mainline remove hide api SubscriptionInfo.getCardString
Bug: 147128878
Test: build pass
Change-Id: Idb44af6a01626013339f5ca05486dd11112a5867
2020-01-31 18:48:09 +08:00
Zhen Zhang
d2a7f9ae79 Use feature flag to show/hide AllInOneTetherSettings
This partially reverts commit 0ccc849de7
which added a config value. Instead, we will use feature flag to switch
between the fragments.

This CL also adds a postfix to keys in all_tether_prefs to
de-duplicate with keys in tether_prefs and wifi_tether_settings.

Bug: 148182953
Change-Id: I92832c786473990065a965409072e4117a7e75a8
Fix: 148618984
Test: make RunSettingsRoboTests
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
2020-01-30 16:01:42 -08:00
Bonian Chen
eb2b87aa39 [Settings] Avoid non-owner from crash mobile data settings
Some instance not been initialized under non-owner user mode.

Bug: 146562321
Test: manual
Change-Id: I4f8ac955754cbd8692727a1d0adf283ef3ff512c
2020-01-31 00:33:11 +08:00
Sooraj Sasindran
ef77c1d67f Merge "access system resources with android.R package" 2020-01-29 17:34:53 +00:00
Sarah Chin
1edf46fc74 Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
am: 0c2cd2a94d

Change-Id: Ibce639f419d021ba6abe507381644eb3fd8249ef
2020-01-29 08:14:34 -08:00
Bonian Chen
c820dc191c [Settings] Replace ImsDirectQuery
This is a code refactor to replace
1. Legacy ImsQuery into ImsExecutorQuery
2. ImsDirectQuery into ImsQuery
3. SystemTty into Tty

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I239021c60fff47de307ac7e21641bee56e205861
2020-01-30 00:11:55 +08:00
Sarah Chin
0c2cd2a94d Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor" 2020-01-29 15:56:09 +00:00
Sooraj Sasindran
a30bdaaaf8 access system resources with android.R package
Bug: 143289541
Test: make
Merged-In: Idc10955639bce7b8e579c50af78056389d44d492
Change-Id: Idc10955639bce7b8e579c50af78056389d44d492
2020-01-27 22:17:28 -08:00
Sooraj Sasindran
64f11ee82a Merge "access system resources with android.R package" 2020-01-24 05:36:15 +00:00
Zhen Zhang
0c2e4d3c94 Merge "Add config value to switch between Tether Settings UIs." 2020-01-23 07:07:09 +00:00
Bonian Chen
5fcb8ee011 [Settings] Support default value for APN protocol
Add default value on APN (roaming) protocol based on configuration when user leave it empty during editing APN.

Bug: 142440775
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ApnEditorTest
Change-Id: I3f1ca0ef17ceaaf2a94b21b6034cd74e56081b61
2020-01-23 03:38:29 +08:00
Sooraj Sasindran
740d67320a access system resources with android.R package
Bug: 143289541
Test: make
Change-Id: Idc10955639bce7b8e579c50af78056389d44d492
2020-01-22 10:26:43 -08:00
Bonian Chen
1a3e286d0c Merge "[Settings] replace isNonTtyOrTtyOnVolteEnabled() and isVtEnabledByUser() in VT" 2020-01-22 05:13:06 +00:00
Josh Hou
b942769c2a Merge "Show/hide 5G preferred network type also consider allowed_network_type" 2020-01-22 01:27:51 +00:00
Bonian Chen
562a1872fd Merge "[Settings] replace isNonTtyOrTtyOnVolteEnabled() in VoLTE" 2020-01-21 19:33:04 +00:00
Bonian Chen
c4413a850f [Settings] replace isNonTtyOrTtyOnVolteEnabled() and isWfcEnabledByUser() in WFC
1. Code refactor
2. Replace ImsManager#isNonTtyOrTtyOnVolteEnabled() by combination of
   TelecomManager#getCurrentTtyMode() and
   ImsMmTelManager#isTtyOverVolteEnabled()
3. Replace ImsManager#isWfcEnabledByUser() by
ImsMmTelManager#isVoWiFiSettingEnabled()

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
2020-01-22 00:24:16 +08:00
Bonian Chen
e8771c9ceb [Settings] replace isNonTtyOrTtyOnVolteEnabled() and isVtEnabledByUser() in VT
1. Code refactor
2. Replace ImsManager#isNonTtyOrTtyOnVolteEnabled() by combination of
   TelecomManager#getCurrentTtyMode() and
   ImsMmTelManager#isTtyOverVolteEnabled()
3. Replace ImsManager#isVtEnabledByUser() by
ImsMmTelManager#isVtSettingEnabled()

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

Change-Id: I731c086cfea4330424b042bbf473b3cf77696a8c
2020-01-21 16:13:48 +00:00
Bonian Chen
00f42fb6fc [Settings] replace isNonTtyOrTtyOnVolteEnabled() in VoLTE
1. Code refactor
2. Replace ImsManager#isNonTtyOrTtyOnVolteEnabled() by combination of
   TelecomManager#getCurrentTtyMode() and
   ImsMmTelManager#isTtyOverVolteEnabled()

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I5ea5978529a7ae9a63161caca22fb29102f24150
2020-01-21 16:13:38 +00:00
Bonian Chen
ff1863451f Merge "[Settings] replace isNonTtyOrTtyOnVolteEnabled() in WFC" 2020-01-21 16:11:07 +00:00
Bonian Chen
72717cb537 [Settings] replace isNonTtyOrTtyOnVolteEnabled() in WFC
1. Code refactor
2. Replace ImsManager#isNonTtyOrTtyOnVolteEnabled() by combination of
   TelecomManager#getCurrentTtyMode() and
   ImsMmTelManager#isTtyOverVolteEnabled()

Bug: 140542283
Test: manual
Change-Id: Ia5179ee1a23f054899bc74c796542bae40cdc8d5
2020-01-21 22:40:33 +08:00
Josh Hou
0393bbcc85 Show/hide 5G preferred network type also consider allowed_network_type
1. The carrier or privileged apps will enable/disable network types on
the device, so Settings references the allowed network type to show/hide
5G preferred network type option.

2. For mainline, copy the getNetworkTypeFromRaf() from RadioFamily to
Settings.

Bug: 136730709
Test: Manual test & EnabledNetworkModePreferenceControllerTest
1. Enable allowed_network_type
2. Disable allowed_network_type
Change-Id: I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5
2020-01-21 14:34:51 +00:00
Bonian Chen
4482de98ed Merge "[Settings] add VtQueryImsState for IMS" 2020-01-21 13:30:00 +00:00
Bonian Chen
16b9b8fac8 Merge "[Settings] add VolteQueryImsState for IMS" 2020-01-21 12:45:43 +00:00
Bonian Chen
00a964bc0f Merge "[Settings] Allow more user to take responsibility" 2020-01-21 12:12:57 +00:00
Bonian Chen
1407d80f4c [Settings] add VtQueryImsState for IMS
1. Code refactor
2. Introduce VtQueryImsState and VolteQueryImsState for user enable/disable configuration

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: I72ec009a8808875fef144a24486b94ef4a7fd35c
2020-01-21 20:10:47 +08:00
Bonian Chen
bd9a04ceea [Settings] add VolteQueryImsState for IMS
1. Code refactor
2. Introduce VolteQueryImsState for user enable/disable configuration

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I9c18c8900ac01909030d9433935650c1581a0fb0
2020-01-21 19:39:29 +08:00
Bonian Chen
21f86f9f4d Merge "[Settings] add WifiCallingQueryImsState for IMS" 2020-01-21 11:25:12 +00:00
Bonian Chen
106ac9b648 [Settings] Allow more user to take responsibility
1. Add owner to wifi calling folder
2. Add songferngwang and tomhsu to telephony part

Bug: None
Test: Not required
Change-Id: I455685eb26df69d929ff3ed3c26ce84aa5f6b1f8
2020-01-21 18:16:19 +08:00
Bonian Chen
f63c6f9e4b [Settings] add WifiCallingQueryImsState for IMS
1. Code refactor
2. Introduce WifiCallingQueryImsState for user enable/disable configuration

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Change-Id: Ib337d6418fcc89f81b15b8cb464d03dccc583756
2020-01-21 17:02:01 +08:00
Zhen Zhang
0ccc849de7 Add config value to switch between Tether Settings UIs.
Adding this config value to make it easy to switch to developing
Tethering settings UI. Also, using this config value to make sure
that preferences from new AllInOneTetherSettings screen won't show up in
the search results.

Bug: 147915366
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=TetehrPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: I8c88816a8f2b40fc219cae8d0d442454c5270b2b
2020-01-21 07:37:56 +00:00
Nathan Harold
993ed46715 [DO NOT MERGE] Update CellIdentityGsm Constructor
Add a dummy parameter to the CellIdentityGsm constructor
for backwards compatibility.

As this code doesn't exist in goog/master, add a shim but
don't merge it.

Bug: 135921133
Test: compilation
Change-Id: I707bb4d2b90bfecd5825c25f9a1f92dbd9ccf41b
2020-01-20 22:07:20 -08:00
changbetty
e30517f9a5 [Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings
Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest

Change-Id: I6d7e72a656723c0620d579e1e223945e2a3588af
2020-01-21 14:05:14 +08:00
Rajeev Kumar
840db3034a Merge "Use TetherEnabler in AllInOneTetherSettings to manage master switch" 2020-01-20 05:37:16 +00:00
Zhen Zhang
02dfed6846 Use TetherEnabler in AllInOneTetherSettings to manage master switch
In AllInOneTetherSettings, we use TetherEnabler to hanle all behavior
related to tethering switch on/off.
In TetherEnbler, add WifiManager.WIFI_AP_STATE_CHANGED_ACTION to cover
all possible tethering state change.
TetherEnablerTest is modified accordingly.

Bug: 147322704
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherEnablerTest
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherSettingsTest

Change-Id: I505b3825f79260983fff9d3935ba834ad8f9f690
2020-01-17 11:11:30 -08:00
Sarah Chin
de616afce0 Rename references to getLteOnCdmaMode
Use @SystemApi TelephonyManager#isGlobalModeEnabled()

Test: build
Bug: 147335742
Change-Id: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
2020-01-16 12:38:59 -08:00
Bonian Chen
f121495e69 Merge "[Settings] Remove Phone hidden constants access" 2020-01-16 20:12:27 +00:00
TreeHugger Robot
db6915778e Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:15 +00:00
SongFerng Wang
5f4fadb949 Merge "Mainline: removed legacy UI for network selection mode." 2020-01-16 14:27:25 +00:00
TreeHugger Robot
244afa02d2 Merge "Revert "Settings search - Navigate user to exact page"" 2020-01-16 13:06:24 +00:00
Bonian Chen
4ecff2c833 [Settings] Remove Phone hidden constants access
Remove access to:
1. Phone.CDMA_SUBSCRIPTION_UNKNOWN
2. Phone.PREFERRED_NT_MODE
3. Phone.PREFERRED_CDMA_SUBSCRIPTION

Bug: 147794713
Test: manual
Change-Id: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38
2020-01-16 13:05:33 +00:00
SongFerngWang
affe5406a6 Mainline: removed legacy UI for network selection mode.
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.

Bug: 147128878
Test: build pass
Change-Id: I1a0f431f05268d29afce145c3eb720594cfc57a3
2020-01-16 10:55:46 +00:00
Bonian Chen
6f82fe83f0 Merge "Remove reference of PhoneConstant." 2020-01-16 09:17:01 +00:00