Commit Graph

27869 Commits

Author SHA1 Message Date
Sarah Chin
1edf46fc74 Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
am: 0c2cd2a94d

Change-Id: Ibce639f419d021ba6abe507381644eb3fd8249ef
2020-01-29 08:14:34 -08:00
Sarah Chin
0c2cd2a94d Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor" 2020-01-29 15:56:09 +00:00
Bonian Chen
798b5816d1 Merge "[Settings] DataUsage crash when no SIM inserted"
am: 5c8b22657c

Change-Id: Iab61f527b75c22eab597eea7ffead91babd72de3
2020-01-26 22:05:07 -08:00
Bonian Chen
f550fc2181 [Settings] DataUsage crash when no SIM inserted
Check for null pointer when looking up subcription id.

Bug: 148175728
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Change-Id: Icc1314d262f1af686134dcf6a0b187adfc3eb4df
Merged-In: I4e893fc7de4a3292b3949860ebb59fbe52ac1a8f
2020-01-25 09:37:00 +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
Andrei-Valentin Onea
e89b34a366 Merge "Fix strings in PlatformCompatDashboard"
am: a9f0446ce8

Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
2020-01-20 05:25:45 -08:00
Andrei-Valentin Onea
a9f0446ce8 Merge "Fix strings in PlatformCompatDashboard" 2020-01-20 13:18:06 +00:00
hughchen
c36a071238 Merge "Update api name"
am: f82f807e03

Change-Id: I20240365a45eb27bcfed019ac77e4e6bfe09d24d
2020-01-19 20:25:49 -08:00
Treehugger Robot
f82f807e03 Merge "Update api name" 2020-01-20 04:18:14 +00:00
Andrei Onea
e2f4619602 Fix strings in PlatformCompatDashboard
Be more specific, by referring to 'target SDK', instead of just 'SDK'.

Test: atest PlatformCompatDashboardTest
Bug: 138280620
Change-Id: Ied8dd5d682ed20962040bf81e9b3b3b45166ea46
2020-01-17 16:41:46 +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
Bonian Chen
6f82fe83f0 Merge "Remove reference of PhoneConstant." 2020-01-16 09:17:01 +00:00
hughchen
50c064d502 Update api name
Use CachedBluetoothDevice.connect() instead of
CachedBluetoothDevice.connect(boolean) to connect
Bluetooth device.

Fixes: 141582844
Test: manually
Change-Id: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
Merged-In: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
2020-01-16 10:33:30 +08:00
Xin Li
ccbee6a795 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Bonian Chen
b36f57ae5a Merge "[Settings] Remove unused ImsStatusPreferenceController" 2020-01-15 22:46:00 +00:00
Bonian Chen
e9324b48ab Merge "[Settings] Replacing accessing of PhoneConstants$DataState" 2020-01-15 14:56:36 +00:00
Bonian Chen
58ed9710c7 Remove reference of PhoneConstant.
Copy constants to ApnEditor from PhoneConstant

Test: make
Test: m RunSettingsRoboTests
Change-Id: Idb26ded937dd31f08c96323d5064947a6af86156
Merged-In: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-15 21:52:43 +08:00
Bonian Chen
368c885b98 [Settings] Remove unused ImsStatusPreferenceController
Legacy code clean up.

Bug: 147534443
Test: build pass
Change-Id: I4dd9c1c623296385eab6e14c10956cea27a04f75
2020-01-15 20:50:24 +08:00
Bonian Chen
8845af8a14 [Settings] Replacing accessing of PhoneConstants$DataState
1. Replaced by PhoneStateListner#onPreciseDataConnectionStateChanged().
2. Remove usage of hidden API SubscriptionManager#getPhoneId()

Bug: 147080692
Test: manual
Change-Id: I6e7c9910ed63e027fc02c1835853175745b31b66
2020-01-14 01:18:50 +08:00
Kevin Chang
01357b5b73 Modify the code logic of OnLayoutChangeListener in Caption preferences
Remove the listener and add statement to refresh the text when the caption turns on.

Bug: 142632389
Test: Manual
Change-Id: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
Merged-In: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
2020-01-13 10:10:36 +08:00
Sarah Chin
5ce99e22ff Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
Sarah Chin
9ea18281ee 5G meteredness for telephony framework
Bug: 139070884
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
(cherry picked from commit 0c518d5aab)
2020-01-10 05:53:22 +00:00
Automerger Merge Worker
c0b3551310 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" am: d792d20001 am: 77cc57d9c2
Change-Id: Id34a3b5da71400c651e3a05198210acae155067c
2020-01-09 06:15:54 +00:00
Bonian Chen
d792d20001 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" 2020-01-09 06:00:05 +00:00
Sarah Chin
f7d2691e1e Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Automerger Merge Worker
d0401b1883 Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a
Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de
2020-01-09 03:46:22 +00:00
Treehugger Robot
a24f03d58e Merge "MAP: Add developer option to control map version" 2020-01-09 03:00:28 +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
Sarah Chin
0904e65eb8 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Treehugger Robot
b13a4ef322 Merge "Removed reference to RadioAccessFamily" 2020-01-09 02:09:10 +00:00
Automerger Merge Worker
b85d1971bf Merge "Fix policy for platform compat UI" am: 3208f994c1 am: e184ff6028
Change-Id: If560c3b115101910ab4e7e2976463ebd30d79d1b
2020-01-08 18:54:09 +00:00
Andrei-Valentin Onea
3208f994c1 Merge "Fix policy for platform compat UI" 2020-01-08 18:42:44 +00:00
Automerger Merge Worker
db65d2b0b2 Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc
Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60
2020-01-08 18:25:01 +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
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
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
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
Automerger Merge Worker
08b42adf46 Merge "[Settings] Correct spelling in source code" am: 22c5c7d4a4 am: 42a1f866e4
Change-Id: Iac65c4fb8ded870857207c316946535f4ec87a5f
2019-12-30 07:35:49 +00:00
Bonian Chen
22c5c7d4a4 Merge "[Settings] Correct spelling in source code" 2019-12-30 07:18:59 +00:00
Automerger Merge Worker
c30575610c Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a
Change-Id: Ic36bfe8db4edba2a80353a9d4fa66027e5d92364
2019-12-30 04:59:08 +00: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