Commit Graph

729 Commits

Author SHA1 Message Date
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
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
Edgar Wang
e19ee9a01f Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +08:00
Xiangyu/Malcolm Chen
69a7e054f5 Merge "Remove logic to manually search inactive pSIM." 2020-01-16 04:24:34 +00:00
Malcolm Chen
640e56433f Remove logic to manually search inactive pSIM.
Nowe 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: unittest
Change-Id: Icd131f133e47dae0770a4da71c51de3c2a94b42b
2020-01-15 14:58:07 -08:00
SongFerng Wang
92e7009d8b Merge "Mainline: removed legacy UI for network selection mode." 2020-01-15 10:12:22 +00:00
Bonian Chen
e90436aa25 Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" 2020-01-15 01:04:02 +00:00
Bonian Chen
a82788f554 Merge "[Settings] Remove null checking for TelephonyManager" 2020-01-15 01:03:07 +00:00
SongFerngWang
521ebeafd3 Mainline: removed legacy UI for network selection mode.
Framework does not support getAvailableNetworks(), so legacy
UI does not work. Removed legacy UI for network selection mode.

Bug: 147404387
Test: 1.make RunSettingsRoboTests ROBOTEST_FILTER=\
NetworkScanHelperTest(PASS)
2.make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkSelectSettingsTest(PASS)
Change-Id: I421526e844100b08e0c39e6e993ca09d1fad8457
2020-01-14 23:23:29 +08:00
Zhen Zhang
d0811849ec Merge "Create a fragment class for the new "Hotspot & tethering" screen" 2020-01-14 07:03:12 +00:00
Bonian Chen
ec344c6031 [Settings] Remove null checking for TelephonyManager
1. TelephonyManager#createForSubscriptionId(int) never returns null
   Remove null checking.
2. Adopting context#getSystemService(SubscriptionManager.class)

Bug: None
Test: make
Change-Id: Ie36dea80a4dfabbc34d9d25c50e60e4928b2f936
2020-01-14 01:01:51 +08:00
Zhen Zhang
b60e8ca294 Create a fragment class for the new "Hotspot & tethering" screen
This fragment class is created to display Wifi tether settings, Usb
tether settings and bluetooth tether settings within the single "Hotspot &
tethering" screen. By creating a new fragemnt, we can safely change the
UI by replace fragment name in xml file.
Right now, it only supports wifi tether settings and mostly copied from
WifiTetherSettings.java.

Bug: 146447611
Test: AllInOneTetherSettingsTest is created and run.
Change-Id: Icdac0d4930451e6956dbf6ef0f4b65bce96fed3f
2020-01-12 23:32:44 -08:00
Tom Hsu
452bc35d9c Merge "Remove reference of PhoneConstant." 2020-01-11 09:39:50 +00:00
TreeHugger Robot
01a55e950d Merge "mainline: remove CarrierConfigManager.init" 2020-01-10 18:48:20 +00:00
tom hsu
25f1de88dd Remove reference of PhoneConstant.
Copy constants to ApnEditor from PhoneConstant

Test: make
Test: m RunSettingsRoboTests
Change-Id: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-10 17:30:18 +00:00
SongFerngWang
762e193266 mainline: remove CarrierConfigManager.init
Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Change-Id: I2a72d409574fc281e5de57d58a27551dd040d551
2020-01-10 23:12:30 +08:00
Lee Chou
e9a38a37ba Merge "Replaced reference to setPreferredNetworkType" 2020-01-10 14:50:47 +00:00
TreeHugger Robot
424a2595a7 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" 2020-01-10 13:52:32 +00:00
Lee Chou
c3a453174e Removed reference to PhoneConstant PHONE_TYPE_*
replaced with TelephonyManager.PHONE_TYPE_*

Bug: 147469330
Test: m RunSettingsRoboTests
Change-Id: I286c4879d55e28707081d4cacba1a2c444f92646
2020-01-10 18:48:00 +08:00
Lee Chou
5415922f32 Removed reference to TelephonyManager#from
Bug: 147469171
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Icfbcd948cd5072bd2e44942bff79562f540ab2b4
2020-01-10 17:15:25 +08:00
Lee Chou
3555e1707a Replaced reference to setPreferredNetworkType
replaced with @SystemApi setPreferredNetworkTypeBitmask

Bug: 147405973
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest

Change-Id: I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b
2020-01-10 16:57:53 +08:00
Bonian Chen
9ce7bad930 Merge "[Settings] Code refactor" 2020-01-09 10:37:12 +00:00
Bonian Chen
f399bd1a8c [Settings] Code refactor
Bug: 147338143
Test: build pass
Change-Id: Ib4a92f659ceda3584310591f706958a06ba5ab21
2020-01-09 17:07:25 +08:00
Betty Chang
976dca2149 Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" 2020-01-09 08:49:48 +00:00
Betty Chang
595b8f3bc7 Merge "[Mainline] Use public method in SubscriptionManager for mainline" 2020-01-09 08:49:23 +00:00
Bonian Chen
4873d0e894 Merge "[Settings] Code refactor" 2020-01-09 03:34:04 +00:00
Automerger Merge Worker
a74cbac7af Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2 am: 46f5e64f94
Change-Id: Id01aa204e70d2eb7f9151eccfd2184d06a7aa61b
2020-01-09 02:44:05 +00:00
Automerger Merge Worker
46f5e64f94 Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2
Change-Id: I1b13f79040ba776e8a0c763280d4fc3f89e3f373
2020-01-09 02:26:28 +00:00
Treehugger Robot
b13a4ef322 Merge "Removed reference to RadioAccessFamily" 2020-01-09 02:09:10 +00:00
Bonian Chen
90cb45e31c [Settings] Code refactor
1. Fix comments
2. Split test case

Bug: 147338143
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: I017a3ac8a716e69eb4d9c3e30e20363a215563a2
2020-01-08 14:30:13 +00:00
zoey chen
4a7ad4d74f [Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
2020-01-08 21:23:07 +08:00
Lee Chou
373b43c16e Removed reference to RadioAccessFamily
1. Removed reference to RadioAccessFamily#getNetworkTypeFromRaf,
RadioAccessFamily#getRafFromNetworkType

2. Migrated hidden NETWORK_MODE_* constants in TelephonyManager

Bug: 147079703
Test: build and test manually
Change-Id: I94745edc37d80336197f874cb7b4afd42dfc97a8
2020-01-08 19:13:47 +08:00
changbetty
a8d56184c3 [Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
- getDefaultDataSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
   - getDefaultSmsSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
   - getDefaultVoiceSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());

Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest

Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-01-08 19:13:15 +08:00
Betty Chang
4b7bdb0dfb Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" 2020-01-08 10:21:54 +00:00
changbetty
f4d2771526 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Change-Id: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
2020-01-08 15:48:33 +08:00
changbetty
db816c9dad [Mainline] Use public method in SubscriptionManager for mainline
- getActiveSubscriptionIdList
   To use getActiveSubscriptionInfoList to get subscription Id list
 - getActiveSubscriptionInfoList(Z)
   To use getActiveSubscriptionInfoList() instead

Bug: 144478274
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
       make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest
       make RunSettingsRoboTests ROBOTEST_FILTER=TelephonyBasePreferenceControllerTest
Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
2020-01-08 12:01:17 +08:00
TreeHugger Robot
70cff55a26 Merge "Create preference controller for each tethering option" 2020-01-08 02:08:39 +00:00
Automerger Merge Worker
74baf75975 Merge "[Settings] Remove access to getSimOperator() API" am: cd4113ba5c am: 5113ada6ab
Change-Id: I54323620052496d6cb82d65623eed0a0404f9d45
2020-01-07 18:31:09 +00:00
Bonian Chen
cd4113ba5c Merge "[Settings] Remove access to getSimOperator() API" 2020-01-07 18:06:40 +00:00
Automerger Merge Worker
30fa13d592 Merge "[Settings] Remove PhoneStateIntentReceiver" am: 1a3ed7a560 am: dbc6a6395e
Change-Id: Iece6ca294d5c52595b3ad249a2ea1a09ae0a6e8d
2020-01-07 16:40:17 +00:00
Bonian Chen
1a3ed7a560 Merge "[Settings] Remove PhoneStateIntentReceiver" 2020-01-07 16:21:01 +00:00
Bonian Chen
4061fdd19b [Settings] Code refactor
1. Replace the detection of screen on
2. Refactor updateCell method

Bug: 147263514
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkSelectSettingsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=NetworkOperatorPreferenceTest
Change-Id: I1ae3ee4d1b62b488aeb2163f42878697b770be65
2020-01-07 13:21:45 +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
Zhen Zhang
a990206ee7 Create preference controller for each tethering option
These controllers are responsible for persisting preference values and
managing the visibility and switch state. TetherEnabler will be
listening to changes of shared prefernce values and turn on/off
corresponding type of tethering when tethering is on at that time.

Bug: 146582865
Test: tests are created for each controller class.
Change-Id: I7e601b2bd693da59269517d2988bade7475e7f12
2020-01-06 23:55:30 -08:00