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
Betty Chang
cc9aef705a
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline"
2020-02-04 02:44:15 +00:00
Automerger Merge Worker
35ffa52384
Merge "Tidy up libcore.timezone APIs" am: 45834d96a8
...
Change-Id: I3222600a7fa1d37b7d8e16115ec067d415f2bdba
2020-01-31 16:29:11 +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
Neil Fuller
45834d96a8
Merge "Tidy up libcore.timezone APIs"
2020-01-30 11:25:35 +00:00
Bill Yi
cc3531906a
Import translations. DO NOT MERGE
...
Change-Id: Ic4b6852ea330e15526fe32c4ad5de96cdbb8d7a3
Auto-generated-cl: translation import
2020-01-29 12:59:30 -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
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
Neil Fuller
7b54a31132
Tidy up libcore.timezone APIs
...
Tidy up the libcore.timezone APIs to make them as close as possible to
android.timezone. In future, these classes should be repackages to be
the actual android.timezone classes, so the APIs need to be in sync.
Bug: 148086409
Test: treehugger
Change-Id: I8d0521467bb3c3c8741ce98f50cde0ee8c1bec1a
2020-01-28 15:08:31 +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
Bonian Chen
798b5816d1
Merge "[Settings] DataUsage crash when no SIM inserted"
...
am: 5c8b22657c
2020-01-26 22:05:07 -08:00
Bonian Chen
5c8b22657c
Merge "[Settings] DataUsage crash when no SIM inserted"
2020-01-27 05:21:35 +00: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
Benedict Wong
9d5397ab42
Merge "Add IKEv2/IPsec VPN options"
...
am: b189ffb318
2020-01-22 22:09:59 -08:00
Benedict Wong
b189ffb318
Merge "Add IKEv2/IPsec VPN options"
2020-01-23 05:11:47 +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
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
2020-01-19 20:25:49 -08:00
Treehugger Robot
f82f807e03
Merge "Update api name"
2020-01-20 04:18:14 +00:00
Android Build Merger (Role)
38b21bca73
Merge "Merge "Move the app to /system_ext" am: c8e4d7953e" into stage-aosp-master
2020-01-17 20:17:59 +00:00
Jeongik Cha
3aa8d52dd6
Merge "Move the app to /system_ext"
...
am: c8e4d7953e
2020-01-17 12:14:41 -08:00
Automerger Merge Worker
495d861928
Merge "Move the app to /system_ext" am: c8e4d7953e
...
Change-Id: I515919946b7438ca0e7971127a394545c1e61ea0
2020-01-17 20:13:16 +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
c8e4d7953e
Merge "Move the app to /system_ext"
2020-01-17 11:44:42 +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
83e2fa8b03
Merge "Remove reference of PhoneConstant."
...
am: 6f82fe83f0
2020-01-16 02:08:17 -08:00
Bonian Chen
6f82fe83f0
Merge "Remove reference of PhoneConstant."
2020-01-16 09:17:01 +00:00
Jeongik Cha
13aaa6ab4e
Move the app to /system_ext
...
As mentioned in go/partitions-in-r, we plan to forbid hidden API in
product partition.
So this app should be moved to /system_ext because it uses hidden API.
It is not permanent, so they can be moved back to /product due to
needs if there isn't hidden usage anymore.
Bug: 137908189
Test: m
Test: check whether device boots successfully
Exempt-From-Owner-Approval: cherry-pick from internal
Change-Id: Icd2f7fc7021e84fad9980d58688dc640ca4245f8
Merged-In: Icd2f7fc7021e84fad9980d58688dc640ca4245f8
2020-01-16 06:45:18 +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
4a16d794e8
Merge "[Settings] Remove unused ImsStatusPreferenceController"
...
am: b36f57ae5a
2020-01-15 15:08:44 -08:00
Bonian Chen
b36f57ae5a
Merge "[Settings] Remove unused ImsStatusPreferenceController"
2020-01-15 22:46:00 +00:00
Bonian Chen
96e43012a1
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
...
am: e9324b48ab
2020-01-15 07:02:18 -08: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
658444b986
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
...
am: 9c79dfb493
2020-01-13 00:06:28 -08:00
Kevin Chang
9c79dfb493
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
2020-01-13 07:44:18 +00: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
Automerger Merge Worker
0e5c9124f0
[automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0990e22af9fca905e34d8afa5dc978f3d5f11af1
2020-01-11 19:34:44 +00:00
Bill Yi
5680c7b0e4
Import translations. DO NOT MERGE
...
Change-Id: I2ef156b791ffe0cd24dcdb6501cf18dc07625d50
Auto-generated-cl: translation import
2020-01-11 06:40:09 -08:00
Automerger Merge Worker
875ac6925a
[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff am: dd1c7d0a8a -s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
2020-01-10 17:18:30 +00:00
Sarah Chin
dd1c7d0a8a
Merge "5G meteredness for telephony framework"
...
am: 5ce99e22ff
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
Sarah Chin
c21d0ca119
Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
2020-01-10 16:32:40 +00:00
changbetty
4bdbd135fb
[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline
...
Bug: 146309719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
2020-01-10 17:15:09 +08:00
Automerger Merge Worker
d41ee5451c
Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948 am: ed119d3b0e
...
Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8
2020-01-10 07:40:16 +00:00
