TreeHugger Robot
b5bbfa742e
Merge "Batterystats: "none" Data connection state should reflect only out of service"
2019-04-04 03:30:58 +00:00
Yifan Hong
cb6111929a
Merge "Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be" into pi-dev-plus-aosp
...
am: a185e8bd08
2019-04-03 20:18:44 -07:00
Yin-Chia Yeh
b6e470f056
Merge "Camera: add QCIF resolution exception" into pi-dev am: 5b09928b22
...
am: 2518bcd55c
2019-04-03 19:54:25 -07:00
Rich Cannings
4fd16e01ba
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am: 9bdc35b2df
...
am: e5b407a224
2019-04-03 19:44:07 -07:00
TreeHugger Robot
1ea486b5ca
Merge "Fix remaining pointer leaks in Asset.cpp"
2019-04-04 02:35:22 +00:00
Android Build Merger (Role)
a185e8bd08
Merge "Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be" into pi-dev-plus-aosp
2019-04-04 02:34:11 +00:00
Yifan Hong
1a7322d74b
Merge "Fix NetworkStackTests." am: e4d640b3a8
...
am: ab98e503be
2019-04-03 19:33:51 -07:00
Yin-Chia Yeh
2518bcd55c
Merge "Camera: add QCIF resolution exception" into pi-dev
...
am: 5b09928b22
2019-04-03 19:29:04 -07:00
PO HUNG CHEN
478df73041
Merge "Add SD card support for AOT"
2019-04-04 02:27:37 +00:00
TreeHugger Robot
7bdb242a06
Merge "ApplicationLoaders: hard failures & tests"
2019-04-04 02:12:16 +00:00
Rich Cannings
e5b407a224
Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev
...
am: 9bdc35b2df
2019-04-03 19:11:36 -07:00
Yifan Hong
ab98e503be
Merge "Fix NetworkStackTests."
...
am: e4d640b3a8
2019-04-03 19:03:26 -07:00
Android Build Merger (Role)
7de8483a2b
Merge "Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 am: c7ca13334b am: 47a11c51b9"
2019-04-04 01:57:53 +00:00
Cody Kesting
41d5edb370
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 am: c7ca13334b
...
am: 47a11c51b9
2019-04-03 18:57:11 -07:00
Todd Kennedy
b19115917d
Merge "fix nullability"
2019-04-04 01:53:45 +00:00
Chris Forbes
e429d2535d
[automerger skipped] Merge "[DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp" into pi-dev-plus-aosp
...
am: a506be5fd0
2019-04-03 18:49:50 -07:00
paulhu
3ffe2fb80b
Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340 am: ccc12f673b
...
am: 71c6372844
2019-04-03 18:47:51 -07:00
Cody Kesting
47a11c51b9
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887
...
am: c7ca13334b
2019-04-03 18:39:58 -07:00
Christine Franks
a518d7aaa5
Merge "Add display white balance enabled methods to CDS"
2019-04-04 01:38:46 +00:00
Android Build Merger (Role)
b382a91b68
Merge "[automerger skipped] Merge "Removed data and voice RAT from service state" am: ced4a31769 am: 279a924fdf am: f3c6f0e47c -s ours am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1 5ff5ab5649 is in history"
2019-04-04 01:33:07 +00:00
Jack Yu
e56573b308
[automerger skipped] Merge "Removed data and voice RAT from service state" am: ced4a31769 am: 279a924fdf
...
am: f3c6f0e47c5ff5ab5649
2019-04-03 18:31:23 -07:00
TreeHugger Robot
920ddb9b66
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView"
2019-04-04 01:28:23 +00:00
Chris Forbes
a506be5fd0
Merge "[DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp" into pi-dev-plus-aosp
2019-04-04 01:27:01 +00:00
Kevin Chyn
0644557a1f
Merge "Fix enumerate corner case"
2019-04-04 01:26:54 +00:00
Yifan Hong
e4d640b3a8
Merge "Fix NetworkStackTests."
2019-04-04 01:21:34 +00:00
Yifan Hong
0e5459731f
Fix NetworkStackTests.
...
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.
Test: atest
Fixes: 129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
2019-04-03 18:15:22 -07:00
Cody Kesting
c7ca13334b
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
...
am: 4d71a57887
2019-04-03 17:59:43 -07:00
paulhu
71c6372844
Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340
...
am: ccc12f673b
2019-04-03 17:57:14 -07:00
Bill Rassieur
8529de03e7
Merge master@5428150 into git_qt-dev-plus-aosp.
...
am: bea579f238
2019-04-03 17:50:35 -07:00
Jack Yu
f3c6f0e47c
Merge "Removed data and voice RAT from service state" am: ced4a31769
...
am: 279a924fdf
2019-04-03 17:41:58 -07:00
Kevin Chyn
e31156f256
Merge "Update BiometricPrompt default title"
2019-04-04 00:35:01 +00:00
paulhu
ccc12f673b
Merge "Fix ConnectivityServiceTest fail."
...
am: fa8fc65340
2019-04-03 17:24:39 -07:00
Mark Renouf
b1709f88bb
Merge "Set system gesture exclusion rects for Bubbles"
2019-04-04 00:23:36 +00:00
Xiangyu/Malcolm Chen
2fec69813c
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am: 63bf486921 am: 2cadf8e9f9
...
am: 3722b6907f2e1f945a6c
2019-04-03 17:13:58 -07:00
Jack Yu
279a924fdf
Merge "Removed data and voice RAT from service state"
...
am: ced4a31769
2019-04-03 17:13:45 -07:00
Susi Kharraz-Post
0c70be6738
Merge "Add logging for direct share target"
2019-04-04 00:03:56 +00:00
Jack He
412e35af24
Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"
2019-04-04 00:01:16 +00:00
Cody Kesting
4d71a57887
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
2019-04-04 00:01:06 +00:00
Lucas Dupin
96ec115e1a
Merge "Make KeyguardSliceView title tappable"
2019-04-04 00:00:23 +00:00
TreeHugger Robot
28a02ae862
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
2019-04-03 23:57:20 +00:00
TreeHugger Robot
d942bd1550
Merge "Disallow pruning system shared static libraries"
2019-04-03 23:57:10 +00:00
Treehugger Robot
fa8fc65340
Merge "Fix ConnectivityServiceTest fail."
2019-04-03 23:54:38 +00:00
Xiangyu/Malcolm Chen
3722b6907f
Merge "Clean up a few names of Telephony intent extra." am: 63bf486921
...
am: 2cadf8e9f9
2019-04-03 16:49:33 -07:00
Kevin Chyn
9af1448d50
Merge "Make get/set feature async between settings and service"
2019-04-03 23:46:14 +00:00
Jack He
ac33c99889
Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged
...
Bug: 112969790
Test: make, test drive with statsd
Change-Id: Ic732d48b69799f241a0e96c159b06c778392d2bf
2019-04-03 23:45:32 +00:00
TreeHugger Robot
259c73c007
Merge "Move NetworkStatsFactory into service directory"
2019-04-03 23:44:26 +00:00
Bill Rassieur
d7ffb21343
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: bf3de50711
2019-04-03 16:41:27 -07:00
Jack Yu
ced4a31769
Merge "Removed data and voice RAT from service state"
2019-04-03 23:39:24 +00:00
Christine Franks
fc9fb21695
Merge "Reserve display white balance metric"
2019-04-03 23:37:32 +00:00
Shuo Qian
961cda0cb5
[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afacec am: 4362b01d2c
...
am: 47fdabe9fac6d55453ee
2019-04-03 16:28:45 -07:00
