OSDN Git Service
Andrew Hsieh [Tue, 24 Apr 2018 16:13:44 +0000 (09:13 -0700)]
Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev
am:
d6afc52a9c
Change-Id: I655c45bace10a69437cad9536f30b19c09692186
Andrew Hsieh [Tue, 24 Apr 2018 16:05:23 +0000 (16:05 +0000)]
Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev
Adrian Roos [Tue, 24 Apr 2018 14:00:03 +0000 (07:00 -0700)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
am:
fd935d3a12
Change-Id: I94cb7eb84ce34554524339bc1ba7c64cb7b2e46a
David Brazdil [Tue, 24 Apr 2018 13:52:07 +0000 (06:52 -0700)]
Merge "Add more hidden APIs to light greylist" into pi-dev
am:
6021921b94
Change-Id: I5fdff2a1910cc960eb190642c19afd4f1e8ec538
Beverly [Tue, 24 Apr 2018 13:47:03 +0000 (06:47 -0700)]
Merge "Edit dnd icon in volume dialog" into pi-dev
am:
57e77be49d
Change-Id: Ie4698f1ceacf92eb4551ee0ca27b25696e6f1b6d
TreeHugger Robot [Tue, 24 Apr 2018 13:40:45 +0000 (13:40 +0000)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 13:34:10 +0000 (13:34 +0000)]
Merge "Add more hidden APIs to light greylist" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 13:34:05 +0000 (13:34 +0000)]
Merge "Edit dnd icon in volume dialog" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 13:22:16 +0000 (06:22 -0700)]
Merge "Make password history hashing more secure" into pi-dev
am:
66b6d1c3bc
Change-Id: Iae4f9ca93a193d24b23410c92659d35a50506b4b
TreeHugger Robot [Tue, 24 Apr 2018 13:06:57 +0000 (13:06 +0000)]
Merge "Make password history hashing more secure" into pi-dev
Rebecca Silberstein [Tue, 24 Apr 2018 12:58:08 +0000 (05:58 -0700)]
Merge "update wifi unit test script" into pi-dev
am:
4a7913c268
Change-Id: I1a55eed1317ab101837b24d3162d1218d19c6ef6
TreeHugger Robot [Tue, 24 Apr 2018 12:45:34 +0000 (12:45 +0000)]
Merge "update wifi unit test script" into pi-dev
Adrian Roos [Tue, 24 Apr 2018 12:21:39 +0000 (14:21 +0200)]
Keyguard: Don't lock when phone process crashes
Fixed an issue where the keyguard locked in response to the
phone process crashing. Since that's not avoidable for the
moment, don't treat unknown sim states as absent.
Bug:
78060670
Test: adb shell kill `pid com.android.phone`; verify that the phone did not lock
Change-Id: Ic5aa51d3b0521740b828d934c6653f8d5ae6380a
Bernardo Rufino [Tue, 24 Apr 2018 12:20:29 +0000 (05:20 -0700)]
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
am:
ad8159bea0
Change-Id: I3500ed3ae311d5df2ddf265a7132ac05d7eb536c
TreeHugger Robot [Tue, 24 Apr 2018 12:12:53 +0000 (12:12 +0000)]
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
Jorim Jaggi [Tue, 24 Apr 2018 11:45:31 +0000 (04:45 -0700)]
Merge "Only allow using PendingRemAnimRegistry on top launched activity" into pi-dev
am:
0bbd1f573f
Change-Id: Id077a12926a375f727f94882a4a08d6387940e28
Jorim Jaggi [Tue, 24 Apr 2018 11:32:02 +0000 (11:32 +0000)]
Merge "Only allow using PendingRemAnimRegistry on top launched activity" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 11:10:58 +0000 (04:10 -0700)]
Merge "Clarify SystemUpdatePolicy" into pi-dev
am:
4019c39405
Change-Id: I7d9129aaa404940391139acf2f40eca97fda9165
TreeHugger Robot [Tue, 24 Apr 2018 10:59:50 +0000 (10:59 +0000)]
Merge "Clarify SystemUpdatePolicy" into pi-dev
David Brazdil [Mon, 23 Apr 2018 16:54:24 +0000 (17:54 +0100)]
Add more hidden APIs to light greylist
Bug:
78242776
Test: make
Merged-In: I3e1f6acd805ca73509a896066a336432f29d0c87
Change-Id: Ieb2eb62201a6f270afd76ae3f6e5ca6226dd57a6
Bernardo Rufino [Tue, 24 Apr 2018 10:29:02 +0000 (11:29 +0100)]
Check self permission in BackupManager#isBackupServiceActive
Old method only checked for IPC caller, method isn't an IPC, adding
check for self permission as well.
Bug:
78467264
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testBackupServiceActive
Change-Id: If9eed90f2deaaf1a4f2376fdf1881e62ee8954fb
Chalard Jean [Tue, 24 Apr 2018 10:02:11 +0000 (03:02 -0700)]
Merge changes I0cd83a93,I03ae2bbb into pi-dev
am:
411e79b8b0
Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Chalard Jean [Tue, 24 Apr 2018 09:53:32 +0000 (09:53 +0000)]
Merge changes I0cd83a93,I03ae2bbb into pi-dev
* changes:
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
Selim Cinek [Tue, 24 Apr 2018 09:26:30 +0000 (02:26 -0700)]
Merge changes from topic "notification_reply_action" into pi-dev
am:
53790c1c8f
Change-Id: Ia6f227ca49a2004a2346da91cfea4f9a3fa65c47
Selim Cinek [Tue, 24 Apr 2018 09:10:38 +0000 (09:10 +0000)]
Merge changes from topic "notification_reply_action" into pi-dev
* changes:
Cleaned up the paddings of the messaging layout and smart replies
Changed the size of the largeIcon
Moved the disabling from alpha to manual color blending
Updated the color of the reply button to be more neutral
Updated the reply icon
Disabled reply action when pending intents are cancelled
Split the reply icon permanently from the right icon
Kenny Guy [Tue, 24 Apr 2018 09:02:47 +0000 (02:02 -0700)]
Merge "Add spinner for smart replies." into pi-dev
am:
5f18904a00
Change-Id: I2eed8580057fe6565674c376ffd5cbdc5aaf0dcd
TreeHugger Robot [Tue, 24 Apr 2018 08:51:56 +0000 (08:51 +0000)]
Merge "Add spinner for smart replies." into pi-dev
Nicolas Geoffray [Tue, 24 Apr 2018 08:40:55 +0000 (01:40 -0700)]
Merge "Add light grey APIs." into pi-dev
am:
95b7e63103
Change-Id: I957ef767bf25ed36b4fb05e2cde6715c6b99cd56
Chalard Jean [Wed, 18 Apr 2018 11:18:38 +0000 (20:18 +0900)]
Make sure getActiveNetwork is consistent with default callbacks
Bug:
77737389
Test: runtest framework-net
new test don't pass without the main code change, but they
do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
Nicolas Geoffray [Tue, 24 Apr 2018 08:30:12 +0000 (08:30 +0000)]
Merge "Add light grey APIs." into pi-dev
Przemyslaw Szczepaniak [Tue, 24 Apr 2018 08:17:50 +0000 (01:17 -0700)]
Merge "Log package name when showing targetSdkVersion warning" into pi-dev
am:
9d4d6e9d1a
Change-Id: Ifa31ef06df225421914bd4326859286a8ff8edbf
TreeHugger Robot [Tue, 24 Apr 2018 08:07:27 +0000 (08:07 +0000)]
Merge "Log package name when showing targetSdkVersion warning" into pi-dev
Yu-Han Yang [Tue, 24 Apr 2018 07:04:46 +0000 (00:04 -0700)]
Merge "Check provider exists and is enabled when request location" into pi-dev
am:
4c958d0e6b
Change-Id: I206e7a4a0ff3990ea8cf94decb6112c769e545f8
Przemyslaw Szczepaniak [Mon, 23 Apr 2018 12:17:13 +0000 (13:17 +0100)]
Log package name when showing targetSdkVersion warning
Test: manual verification
Bug:
78332004
Change-Id: Ie91ac06e3a973edf655362b836698185a0aa7602
TreeHugger Robot [Tue, 24 Apr 2018 06:57:34 +0000 (06:57 +0000)]
Merge "Check provider exists and is enabled when request location" into pi-dev
Selim Cinek [Mon, 23 Apr 2018 10:00:54 +0000 (18:00 +0800)]
Cleaned up the paddings of the messaging layout and smart replies
Refactored the code such that the reply icon's inset was substracted
from the overall paddings to make all of them consistent. This
will also help in the future as we don't have to update those
paddings manually anymore.
Test: test all sorts of combinations with Notify
Change-Id: I8c6c9951bc73c88d95cb443c8e618c7adca7ebd3
Fixes:
78441535
Chalard Jean [Wed, 18 Apr 2018 10:18:58 +0000 (19:18 +0900)]
Add tests for getActiveNetwork.
Bug:
77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
Selim Cinek [Mon, 23 Apr 2018 08:09:23 +0000 (16:09 +0800)]
Changed the size of the largeIcon
Also tunes the paddings with largeIcons more
Test: test margins for all templates, ensure nice wrapping
Change-Id: I9ace23c2a6b38fdf25e46fd55d6848b8922851a3
Fixes:
76415894
Selim Cinek [Thu, 19 Apr 2018 02:24:39 +0000 (10:24 +0800)]
Moved the disabling from alpha to manual color blending
The Transformations don't preserve alpha currently and it's
hard to fix without the risk of introducing regressions.
We instead blend the color manually now.
Change-Id: Ib9c209295529c5e04564a3faed74160914951152
Fixes:
77811784
Nathan Harold [Tue, 24 Apr 2018 05:20:13 +0000 (22:20 -0700)]
[automerger skipped] Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" am:
238eaf5183
am:
26123f6efd -s ours
Change-Id: I9f4a7b11a816382439daed8fc9ffaf7a8d2c7aea
Nathan Harold [Tue, 24 Apr 2018 05:11:58 +0000 (22:11 -0700)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
am:
238eaf5183
Change-Id: Id49766c04ddfe89a28c37360c35959ff2a4a329a
Selim Cinek [Thu, 19 Apr 2018 01:19:15 +0000 (09:19 +0800)]
Updated the color of the reply button to be more neutral
The primaryTextColor wasn't a good fit, because it was
drawing too much attention being pure black. We're now
taking the default color instead. It's also used for
active permissions now.
Test: add notification, look at reply button.
Change-Id: If390c66e927a92a1115250abb7254fafe81b054c
Fixes:
72750728
Selim Cinek [Wed, 18 Apr 2018 08:01:07 +0000 (16:01 +0800)]
Updated the reply icon
Change-Id: I0f8e91630cedefc6d9f44ded421243b719db7e6c
Fixes:
77244755
Test: observe new icon on notificaction
Selim Cinek [Wed, 18 Apr 2018 06:34:27 +0000 (14:34 +0800)]
Disabled reply action when pending intents are cancelled
Previously the user could open inline reply even when the
action was already cancelled. This also enables listening
to pending intent cancellations.
Test: manual
Fixes:
77811784
Change-Id: I4ae164081c6abdeb60a8e78d61bf5e4f26cca1d3
Yu-Han Yang [Tue, 24 Apr 2018 04:11:28 +0000 (21:11 -0700)]
Merge "Update Java doc of GnssMeasurementEvent#STATUS_NOT_ALLOWED" into pi-dev
am:
d5a1bb621a
Change-Id: I17d4dfbcc386050988dabfcaae8b5dc6b58450f6
Yu-Han Yang [Tue, 24 Apr 2018 04:04:19 +0000 (21:04 -0700)]
Merge "Refactor GnssBatchingProvider" into pi-dev
am:
4257db35fe
Change-Id: Ib53b4c6602c7356e956d879af64e85cdd6067cc6
TreeHugger Robot [Tue, 24 Apr 2018 04:01:56 +0000 (04:01 +0000)]
Merge "Update Java doc of GnssMeasurementEvent#STATUS_NOT_ALLOWED" into pi-dev
Treehugger Robot [Tue, 24 Apr 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
TreeHugger Robot [Tue, 24 Apr 2018 03:56:20 +0000 (03:56 +0000)]
Merge "Refactor GnssBatchingProvider" into pi-dev
Todd Kennedy [Tue, 24 Apr 2018 03:23:12 +0000 (20:23 -0700)]
Merge "Allow overriding the compile SDK" into pi-dev
am:
fd5166ddac
Change-Id: I53d265b82f4a0e9b86b1324900e133911a355104
TreeHugger Robot [Tue, 24 Apr 2018 03:14:04 +0000 (03:14 +0000)]
Merge "Allow overriding the compile SDK" into pi-dev
Shawn Lin [Tue, 24 Apr 2018 02:56:34 +0000 (19:56 -0700)]
Merge "Fix the art work of lockscreen cannot be removed" into pi-dev
am:
ab416a115a
Change-Id: I881f96dc669b8e974e0912240bd227e84558d70a
Shawn Lin [Tue, 24 Apr 2018 02:46:28 +0000 (02:46 +0000)]
Merge "Fix the art work of lockscreen cannot be removed" into pi-dev
Andreas Gampe [Tue, 24 Apr 2018 01:45:44 +0000 (18:45 -0700)]
[automerger skipped] Merge "PackageManager: Skip dexopt on install for debuggable apps" into pi-dev
am:
f22fd65a25 -s ours
Change-Id: Iefee9ec4b410ab9571bdd9d46ba8111ec1a91a9c
TreeHugger Robot [Tue, 24 Apr 2018 01:36:13 +0000 (01:36 +0000)]
Merge "PackageManager: Skip dexopt on install for debuggable apps" into pi-dev
Justin Yun [Mon, 23 Apr 2018 07:36:41 +0000 (16:36 +0900)]
pm: skip scan-as-privileged for OMR1 vendors
Skip scan-as-privileged for OMR1 vendors because OMR1 could not
define privileged apps in vendor partition.
Bug:
78105955
Bug:
78134108
Test: Flash P-GSI on OMR1 device and check boot
Change-Id: I968e779ea66587563907589ad22d1191a89fe463
Salvador Martinez [Tue, 24 Apr 2018 01:04:34 +0000 (18:04 -0700)]
Merge "Update title for SysUI battery warning" into pi-dev
am:
0545eaefdd
Change-Id: I02163465841504b3894c71bb0e4ea34205a44170
Rob Carr [Tue, 24 Apr 2018 00:54:05 +0000 (17:54 -0700)]
Merge "Destroy app-less surfaces when becoming invisible with no animation." into pi-dev
am:
d7681ccd25
Change-Id: I3452a981dc23ea9617e7e78af4c0c7f93f60ca52
Bryce Lee [Tue, 24 Apr 2018 00:48:04 +0000 (17:48 -0700)]
Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev
am:
a16cc4215a
Change-Id: Ib05d3f19b1c01f3df5d833153494b861c4cfeac1
TreeHugger Robot [Tue, 24 Apr 2018 00:46:56 +0000 (00:46 +0000)]
Merge "Update title for SysUI battery warning" into pi-dev
Android Build Merger (Role) [Tue, 24 Apr 2018 00:38:41 +0000 (00:38 +0000)]
Merge "Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev am:
694f60005e" into pi-dev-plus-aosp
Suprabh Shukla [Tue, 24 Apr 2018 00:38:05 +0000 (17:38 -0700)]
Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev
am:
694f60005e
Change-Id: Ic254a8b361dfdfc199ff7b565f1f7491a15ff41f
Android Build Merger (Role) [Tue, 24 Apr 2018 00:34:07 +0000 (00:34 +0000)]
Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am:
5faf7291f0 am:
09a80d1797" into pi-dev-plus-aosp
Andreas Gampe [Tue, 24 Apr 2018 00:32:43 +0000 (17:32 -0700)]
Merge "PackageManager: Skip dexopt on install for debuggable apps" am:
5faf7291f0
am:
09a80d1797
Change-Id: I9d889e1a69fd1c82582b549b4ca630061f519366
Amin Shaikh [Tue, 24 Apr 2018 00:31:40 +0000 (17:31 -0700)]
Merge "Disable hotspot when data saver is on." into pi-dev
am:
be99e9e60d
Change-Id: I22b33064a6ab2b6507fa71ce94190eb85d2de4ba
Rob Carr [Tue, 24 Apr 2018 00:27:36 +0000 (00:27 +0000)]
Merge "Destroy app-less surfaces when becoming invisible with no animation." into pi-dev
Bryce Lee [Tue, 24 Apr 2018 00:25:42 +0000 (00:25 +0000)]
Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev
Andreas Gampe [Tue, 24 Apr 2018 00:24:58 +0000 (17:24 -0700)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
am:
5faf7291f0
Change-Id: I5cd62f4ac85dc16c1ff00233096b3b6ec60a3db2
Winson Chung [Tue, 24 Apr 2018 00:24:36 +0000 (17:24 -0700)]
Merge "Expose API to hide the IME during a recents animation" into pi-dev
am:
6fab40d82c
Change-Id: I8e70b7ae5d74d3dd85461bb13fcbff16f718d2c0
TreeHugger Robot [Tue, 24 Apr 2018 00:17:41 +0000 (00:17 +0000)]
Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev
Jayachandran Chinnakkannu [Tue, 24 Apr 2018 00:13:38 +0000 (17:13 -0700)]
Merge "Data stall intent definition" into pi-dev
am:
88dcad1aa4
Change-Id: Id1b549f662e574695c06d58dc533eafaa257eb3c
TreeHugger Robot [Tue, 24 Apr 2018 00:11:43 +0000 (00:11 +0000)]
Merge "Disable hotspot when data saver is on." into pi-dev
Winson Chung [Mon, 23 Apr 2018 23:59:54 +0000 (23:59 +0000)]
Merge "Expose API to hide the IME during a recents animation" into pi-dev
Jayachandran Chinnakkannu [Mon, 23 Apr 2018 23:59:29 +0000 (23:59 +0000)]
Merge "Data stall intent definition" into pi-dev
Chong Zhang [Mon, 23 Apr 2018 23:38:11 +0000 (16:38 -0700)]
Merge "Move SchedulingPolicyService init code to SystemServerInitThreadPool" into pi-dev
am:
3f8dd1ca7d
Change-Id: I87bd861a64e4ff4b8098493ce2a3ee0708b42967
Fyodor Kupolov [Mon, 23 Apr 2018 23:33:15 +0000 (16:33 -0700)]
Merge "Reset binder call stats along with batterystats" into pi-dev
am:
46c2b1451c
Change-Id: Icc1749b2e67a9b7015a08dd7ddfb481337531aa9
Amith Yamasani [Mon, 23 Apr 2018 23:28:14 +0000 (16:28 -0700)]
Merge "Add reason to device idle history dump" into pi-dev
am:
43ca6addd1
Change-Id: I3008dba871300a26442c9021a02c993cee00e029
Winson Chung [Fri, 20 Apr 2018 22:58:18 +0000 (15:58 -0700)]
Expose API to hide the IME during a recents animation
Bug:
73285089
Test: Swipe up from app with IME open, ensure that it closes
Change-Id: I95ce59291f11285c853e8b3029638119c21f7e38
Chong Zhang [Mon, 23 Apr 2018 23:15:33 +0000 (23:15 +0000)]
Merge "Move SchedulingPolicyService init code to SystemServerInitThreadPool" into pi-dev
Salvador Martinez [Mon, 23 Apr 2018 23:13:19 +0000 (16:13 -0700)]
Update title for SysUI battery warning
We're changing the text from "battery is low" to talk about the
battery running out soon instead so users are not confused if the
time based trigger occurs at higher battery percentages.
Test: robotests pass
Bug:
77587724
Change-Id: Ib7b2c507e150e06e307f810f89c6da407c77990a
TreeHugger Robot [Mon, 23 Apr 2018 23:05:31 +0000 (23:05 +0000)]
Merge "Reset binder call stats along with batterystats" into pi-dev
Andreas Gampe [Mon, 23 Apr 2018 15:59:12 +0000 (08:59 -0700)]
PackageManager: Skip dexopt on install for debuggable apps
To reduce install-to-started latency, skip dexopt at install-time
for debuggable apps. This is a conscious tradeoff, as the app
will run slower, and do repeated work on every startup. However,
for debuggable apps, turnaround time is more important.
(cherry picked from commit
58adf3a8eead2d7594fc1ac15aaed6a5760e7ba4)
Bug:
78200989
Test: m
Test: Device boots
Test: CTS (wrap & JVMTI)
Merged-In: I749934e794b0c89d72ea8ee413b845e7804de184
Change-Id: I749934e794b0c89d72ea8ee413b845e7804de184
Amith Yamasani [Mon, 23 Apr 2018 23:01:13 +0000 (23:01 +0000)]
Merge "Add reason to device idle history dump" into pi-dev
Evan Rosky [Mon, 23 Apr 2018 22:55:48 +0000 (15:55 -0700)]
Merge "Update surface position once created." into pi-dev
am:
8a4af9c3e8
Change-Id: If8b087c21f5b3da6c701c03b814a081c8371c0d5
Rebecca Silberstein [Mon, 23 Apr 2018 22:54:36 +0000 (15:54 -0700)]
update wifi unit test script
Need to add "--no-hidden-api-checks" to unit test script.
Verified by running runtests
Bug:
78465388
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I916a2870bde2cbfe1966d18a0f7a13def2bd1ce7
TreeHugger Robot [Mon, 23 Apr 2018 22:41:50 +0000 (22:41 +0000)]
Merge "Update surface position once created." into pi-dev
Anton Hansson [Mon, 23 Apr 2018 22:36:34 +0000 (15:36 -0700)]
[automerger skipped] Merge "Move frameworks/base off the SRC_API_DIR variable." am:
2a4277fb00
am:
5629dc7849 -s ours
Change-Id: Ie28cc127204e11f965e6e1898c856795169c005f
Treehugger Robot [Mon, 23 Apr 2018 22:35:17 +0000 (22:35 +0000)]
Merge "PackageManager: Skip dexopt on install for debuggable apps"
Winson Chung [Mon, 23 Apr 2018 22:30:23 +0000 (15:30 -0700)]
Merge "Add windowing mode to task snapshot." into pi-dev
am:
167710981c
Change-Id: I0348be9f7e096e7effc1476f5015d33263a163fe
Amin Shaikh [Mon, 23 Apr 2018 22:29:11 +0000 (18:29 -0400)]
Disable hotspot when data saver is on.
Do not process the QS tap on hotspot when data saver is on. The
secondary text already states that "Data Saver is on" and the tile is
greyed out.
Change-Id: Ied86aba4199c94e68cc2cebf7ccd888c8a04dfb8
Fixes:
77860936
Test: visual
Anton Hansson [Mon, 23 Apr 2018 22:21:58 +0000 (15:21 -0700)]
Merge "Move frameworks/base off the SRC_API_DIR variable."
am:
2a4277fb00
Change-Id: I7912e0aec15b478cff139c8312893d418c360ef2
Jason Monk [Mon, 23 Apr 2018 22:21:28 +0000 (15:21 -0700)]
Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev
am:
2897fd315d
Change-Id: I28fbfda37088bb1801396d62e184afa6ddf2ae43
Winson Chung [Mon, 23 Apr 2018 22:16:01 +0000 (22:16 +0000)]
Merge "Add windowing mode to task snapshot." into pi-dev
TreeHugger Robot [Mon, 23 Apr 2018 22:08:31 +0000 (22:08 +0000)]
Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev
Sudheer Shanka [Mon, 23 Apr 2018 21:52:01 +0000 (14:52 -0700)]
Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev
am:
6bc6e21be7
Change-Id: I50eba3f8c2171c511e0b1ecd3d0e605956e97d24
Android Build Merger (Role) [Mon, 23 Apr 2018 21:35:47 +0000 (21:35 +0000)]
Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am:
361ab2c581 am:
6dfacdcaf2" into pi-dev-plus-aosp
Hansong Zhang [Mon, 23 Apr 2018 21:35:26 +0000 (14:35 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am:
361ab2c581
am:
6dfacdcaf2
Change-Id: Ic69f60a8c2dcc9677faa2ab51c03758a823bde31
Sudheer Shanka [Mon, 23 Apr 2018 21:34:57 +0000 (21:34 +0000)]
Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev
Tomasz Wasilczyk [Mon, 23 Apr 2018 21:32:23 +0000 (14:32 -0700)]
Merge "Fix RadioTunerTest." into pi-dev
am:
1fdddabc24
Change-Id: If00335a9b49d4a8ed6a609f144bc2c00b529c184
Victor Hsieh [Mon, 23 Apr 2018 21:26:41 +0000 (14:26 -0700)]
Merge "Verify best signature algorithms of all signers" into pi-dev
am:
c17a171a7b
Change-Id: I05d0dd847c93fdcd594880bc7743fe31a55d2855