Commit Graph

55055 Commits

Author SHA1 Message Date
Sarah Chin
dd1c7d0a8a Merge "5G meteredness for telephony framework"
am: 5ce99e22ff

Change-Id: I5f516f7ba5b4e0ec24283c4b555d4a5ff9ae2ea6
2020-01-10 09:03:56 -08:00
Sarah Chin
5ce99e22ff Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
SongFerngWang
ed119d3b0e Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState"
am: c5e7864948

Change-Id: Ic443ccf38cf3630c6991118ff2cd3f02f6e18864
2020-01-09 23:26:03 -08:00
Treehugger Robot
c5e7864948 Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" 2020-01-10 07:24:57 +00:00
SongFerngWang
9cd3d0daeb mainline:Replace serviceState.getDataRegState with getDataRegistrationState
Bug: 146637978
Test: - make RunSettingsRoboTests ROBOTEST_FILTER\
=PreferredNetworkModePreferenceControllerTest (PASS)
- make RunSettingsRoboTests ROBOTEST_FILTER\
=EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
Merged-In: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
2020-01-10 13:05:36 +08:00
Bonian Chen
77cc57d9c2 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"
am: d792d20001

Change-Id: I40195cc5643262d310a45c89d1751aa8f6c89f1e
2020-01-08 22:03:25 -08:00
Bonian Chen
d792d20001 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" 2020-01-09 06:00:05 +00:00
Sarah Chin
9e040a1198 Merge "Handle 5G meteredness in telephony framework"
am: f7d2691e1e

Change-Id: I605c523ba16df57df339f2c68c330299caa4b3b5
2020-01-08 21:06:16 -08:00
Sarah Chin
f7d2691e1e Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Chienyuan
d8e0b57e3a Merge "MAP: Add developer option to control map version"
am: a24f03d58e

Change-Id: Idc6aeabc4d88adee6dc1c64eeb3648bb42e5f2fc
2020-01-08 19:11:04 -08:00
Philip P. Moltmann
f9dd9dfd52 Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
am: 664ac2ebd7

Change-Id: I646975373dc24244074f761638919239276dbe61
2020-01-08 19:06:21 -08:00
Treehugger Robot
a24f03d58e Merge "MAP: Add developer option to control map version" 2020-01-09 03:00:28 +00:00
Treehugger Robot
664ac2ebd7 Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" 2020-01-09 02:48:14 +00:00
Lee Chou
d934d5eda2 Merge "Removed reference to RadioAccessFamily"
am: b13a4ef322

Change-Id: I982ca4865d7aed198a1e1f78c80f0340218d27a2
2020-01-08 18:11:26 -08:00
Treehugger Robot
b13a4ef322 Merge "Removed reference to RadioAccessFamily" 2020-01-09 02:09:10 +00:00
Andrei-Valentin Onea
e184ff6028 Merge "Fix policy for platform compat UI"
am: 3208f994c1

Change-Id: I88c0caf2c0904db1a1acfae7072699031d66fcdf
2020-01-08 10:47:45 -08:00
Andrei-Valentin Onea
3208f994c1 Merge "Fix policy for platform compat UI" 2020-01-08 18:42:44 +00:00
Bonian Chen
dc4e189dbc Merge "[Settings] Remove IMS factoryReset()"
am: bf3aaf0f37

Change-Id: I56c8a7b23e97bf13e44faedd9a3aac898f3c11e9
2020-01-08 10:09:32 -08:00
Bonian Chen
bf3aaf0f37 Merge "[Settings] Remove IMS factoryReset()" 2020-01-08 17:29:10 +00:00
Andrei Onea
96de9d4cac Fix policy for platform compat UI
Only show debuggable apps on user builds. Also, only enable changes that
are overrideable.

Bug: 138280620
Bug: 144552011
Test: Settings->Developer Options->App Compatibility Changes on user
	build
Test: atest PlatformCompatDashboardTest
Exempt-From-Owner-Approval: Previously approved
Change-Id: Ibf9611d1809492ebe979fc55f9331daf78ca9b27
2020-01-08 16:44:36 +00:00
Bonian Chen
31e07211d9 [Settings] Avoid from accessing createManageSubscriptionIntent(int)
Avoid from accessing
SubscriptionManager#createManageSubscriptionIntent(int).
Create a copy of source code into Settings.

Bug: 147334060
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Id44a6b214a8f5d378d7a536fbf984a0512e6a92d
2020-01-08 23:32:30 +08:00
Bonian Chen
4fa40aed87 [Settings] Remove IMS factoryReset()
IMS factoryReset() has been done within
TelephonyManager.resetSettings().

Bug: 147342492
Test: manual
Change-Id: Ic17b8235e76a4bcf3e6bf5329a88477697a33c51
Merged-In: Id5c868726189397fc2a85717326e56e055b640af
2020-01-08 14:15:37 +00: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
Chienyuan
01f4f8432e MAP: Add developer option to control map version
Bug: 146916756
Test: manual
Change-Id: I6015e5dae8e2c19549babe556b84a2c5b24dd669
Merged-In: If32db03072e02b7b2477c7da943b6b0e6a9be260
2020-01-08 17:04:25 +08:00
Philip P. Moltmann
00d42d0737 (Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList
Test: atest SettingsUnitTests
Bug: 136595429
Change-Id: I2320cd8405ab42fe725f698ca844341785dcd9f9
2020-01-07 16:09:16 -08:00
Bonian Chen
5113ada6ab Merge "[Settings] Remove access to getSimOperator() API"
am: cd4113ba5c

Change-Id: I419340fe39e2e708b376970f1f5b99de6e99e5dc
2020-01-07 10:10:46 -08:00
Bonian Chen
cd4113ba5c Merge "[Settings] Remove access to getSimOperator() API" 2020-01-07 18:06:40 +00:00
Bonian Chen
dbc6a6395e Merge "[Settings] Remove PhoneStateIntentReceiver"
am: 1a3ed7a560

Change-Id: I3e5645099ab4449514cbf385beb099b411893bbd
2020-01-07 08:26:38 -08: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
Neil Fuller
52b3ad3249 Merge "Track system server permission change"
am: 2cf89ae027

Change-Id: I0418dde737c07142a6016823f1604e94dcbf11eb
2020-01-06 13:02:36 -08:00
Neil Fuller
2cf89ae027 Merge "Track system server permission change" 2020-01-06 19:38:25 +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
42a1f866e4 Merge "[Settings] Correct spelling in source code"
am: 22c5c7d4a4

Change-Id: Ia9322a82c58385c4aed2f4b3ffa0d85aed7b123f
2019-12-29 23:21:24 -08:00
Bonian Chen
22c5c7d4a4 Merge "[Settings] Correct spelling in source code" 2019-12-30 07:18:59 +00:00
Lee Chou
2bffc2754a Merge "Changed reference of telecom.Log to util.Log"
am: f9d06dc434

Change-Id: I5fcbf96ab581c71e714de6659b97a1bf9a3a02d9
2019-12-29 20:39:02 -08:00
Lee Chou
f9d06dc434 Merge "Changed reference of telecom.Log to util.Log" 2019-12-30 04:36:18 +00: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
Lee Chou
1c5f319f3c Changed reference of telecom.Log to util.Log
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
Bonian Chen
92f25fadd2 Merge "[Settings] Replace getSimCount() API"
am: b0bddfec15

Change-Id: Ic3ddc7317f92b3d61b841aaa476e2bd734044796
2019-12-26 18:48:55 -08:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Zoey Chen
8ead010c08 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
am: e8cf63ddd3

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605
2019-12-26 06:01:41 -08:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Zoey Chen
4359db040c Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
2019-12-26 05:02:24 -08:00
Zoey Chen
47634431c6 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-26 12:01:22 +00:00
Daniel Huang
7664d08e28 Merge "Modify 5G RAT into Bearer field."
am: 79977fadca

Change-Id: Ie14628c1795dbd02393ef901a0fd7a699a9eba93
2019-12-26 03:32:40 -08:00
Daniel Huang
79977fadca Merge "Modify 5G RAT into Bearer field." 2019-12-26 11:29:13 +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
3835293aea Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId"
am: 047dd2dff9

Change-Id: Ia665022e1d3357f68109905f976b84e89f66c045
2019-12-26 01:39:17 -08:00
Zoey Chen
047dd2dff9 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" 2019-12-26 09:36:58 +00:00