Automerger Merge Worker
7e1e2b7d7d
Dark theme settings text am: 176d4ea28e
...
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
2020-01-09 23:21:23 +00:00
Jay Aliomer
176d4ea28e
Dark theme settings text
...
Dark theme text should be appropriate for all types of screens and
not only OLED types
Test: manual
Bug: 147432824
Change-Id: I1e59329064405c72c6f57c92a82b652cd71853a7
(cherry picked from commit d63839afda
2020-01-09 21:51:47 +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
77cc57d9c2
Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"
...
am: d792d20001
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
Automerger Merge Worker
58e5e9966a
[automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e am: 9e040a1198 -s ours
...
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510
2020-01-09 05:30:14 +00:00
Sarah Chin
9e040a1198
Merge "Handle 5G meteredness in telephony framework"
...
am: f7d2691e1e
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
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
Automerger Merge Worker
d3a80330ba
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2ebd7 am: f9dd9dfd52
...
Change-Id: Idd566f53353a083093ad4ebd15c8289244acce36
2020-01-09 03:45:18 +00:00
Chienyuan
d8e0b57e3a
Merge "MAP: Add developer option to control map version"
...
am: a24f03d58e
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
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
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
Lee Chou
d934d5eda2
Merge "Removed reference to RadioAccessFamily"
...
am: b13a4ef322
2020-01-08 18:11:26 -08: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
e184ff6028
Merge "Fix policy for platform compat UI"
...
am: 3208f994c1
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
Automerger Merge Worker
db65d2b0b2
Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc
...
Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60
2020-01-08 18:25:01 +00:00
Bonian Chen
dc4e189dbc
Merge "[Settings] Remove IMS factoryReset()"
...
am: bf3aaf0f37
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
android-build-team Robot
08371f4f37
Snap for 6117658 from ea38ee575c to qt-qpr2-release
...
Change-Id: I44501989e5ef74f247d4871acee591f550dac6a6
2020-01-08 02:25:45 +00: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
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
5113ada6ab
Merge "[Settings] Remove access to getSimOperator() API"
...
am: cd4113ba5c
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
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
dbc6a6395e
Merge "[Settings] Remove PhoneStateIntentReceiver"
...
am: 1a3ed7a560
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
Automerger Merge Worker
cb39dc74d3
[automerger skipped] Import translations. DO NOT MERGE am: ea38ee575c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic66bd4cda32ee09da1e8759bb47cb9a0c842ec23
2020-01-07 09:51:58 +00:00
Bill Yi
ea38ee575c
Import translations. DO NOT MERGE
...
Change-Id: I534651e241a731ea3b099e5741be1fd8778bd6f8
Auto-generated-cl: translation import
2020-01-06 18:59:23 -08:00
Automerger Merge Worker
eed5099341
Merge "Track system server permission change" am: 2cf89ae027 am: 52b3ad3249
...
Change-Id: I6a8e7376d0374f7dc11efb164f18ffc16e0b107c
2020-01-06 21:20:54 +00:00
Neil Fuller
52b3ad3249
Merge "Track system server permission change"
...
am: 2cf89ae027
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
android-build-team Robot
fdad130808
Snap for 6103831 from 7369a964a2 to qt-qpr2-release
...
Change-Id: I797a019ac71ae0dcac7a44f3a25bc67f7990977a
2019-12-31 02:12:56 +00: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
42a1f866e4
Merge "[Settings] Correct spelling in source code"
...
am: 22c5c7d4a4
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
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
2bffc2754a
Merge "Changed reference of telecom.Log to util.Log"
...
am: f9d06dc434
2019-12-29 20:39:02 -08:00
