Svetoslav Ganov
7014eef54a
Merge "Teach persistable Uri grants about direct boot" into nyc-dev
2016-06-08 21:54:40 +00:00
Adarsh Fernando
2bac690639
AS UI redirect for experimental to stable Gradle migration guide am: c65f7e8071 am: 28f355bb63
...
am: fe089e3dc5
2016-06-08 21:21:01 +00:00
Adam Lesinski
e7f4f0297f
Consume the first sample of KernelUidCpuTimeReader
...
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
Adarsh Fernando
fe089e3dc5
AS UI redirect for experimental to stable Gradle migration guide am: c65f7e8071
...
am: 28f355bb63
2016-06-08 21:18:02 +00:00
Adarsh Fernando
28f355bb63
AS UI redirect for experimental to stable Gradle migration guide
...
am: c65f7e8071
2016-06-08 21:12:56 +00:00
Adarsh Fernando
c65f7e8071
AS UI redirect for experimental to stable Gradle migration guide
...
- This guide may be moved over to DAC when AS 2.2 goes stable.
Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e
2016-06-08 13:42:37 -07:00
Adrian Roos
778271cbaa
Merge \"Direct Reply: Add back emoji button\" into nyc-dev
...
am: 3207d8f8a1
2016-06-08 20:34:16 +00:00
Adrian Roos
3207d8f8a1
Merge "Direct Reply: Add back emoji button" into nyc-dev
2016-06-08 20:25:01 +00:00
David Sehr
ac063d64ea
Simplify code paths computation, allow adb root to dump
...
Bug: 28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a
2016-06-08 13:24:29 -07:00
Adrian Roos
713fed9226
Direct Reply: Add back emoji button
...
Bug: 29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
2016-06-08 13:22:25 -07:00
Robert Carr
eb973f4390
Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev
...
am: b99e19c729
2016-06-08 20:13:18 +00:00
TreeHugger Robot
b99e19c729
Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev
2016-06-08 20:08:38 +00:00
Selim Cinek
20367dbd3b
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
am: bbcb733d80
2016-06-08 19:45:13 +00:00
Svet Ganov
f581be6ff5
Teach persistable Uri grants about direct boot
...
We read the persistable Uri grants on boot at which point
the user is not unlocked. This results in ignoring Uri
grants for boot unaware content providers.
This change reads all persisted Uri grants on boot but
filters them out during query based on the current user
unlock state.
bug:29058113
Change-Id: I2643fc098f42359e72a4c534236debc9b9389256
2016-06-08 12:44:20 -07:00
Selim Cinek
bbcb733d80
Merge changes I0ca13626,I3677ce54 into nyc-dev
...
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
2016-06-08 19:37:40 +00:00
Jason Monk
7399cf0ca6
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
...
am: fd6e7e6790
2016-06-08 19:21:33 +00:00
Jason Monk
d97d435c09
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
...
am: 883da638e2
2016-06-08 19:21:29 +00:00
Jason Monk
781e8c2bfb
Merge \"QS: Show date even on small screens\" into nyc-dev
...
am: fbf366d7ee
2016-06-08 19:21:26 +00:00
Will Harmon
81f69753ed
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
...
am: 4455fc734c
2016-06-08 19:21:22 +00:00
Jason Monk
a62da52365
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
...
am: 27eadb6f1d
2016-06-08 19:15:34 +00:00
Jason Monk
fd6e7e6790
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
2016-06-08 19:12:20 +00:00
Jason Monk
883da638e2
Merge "QS: Fix leak in QSAnimator" into nyc-dev
2016-06-08 19:12:07 +00:00
Jason Monk
fbf366d7ee
Merge "QS: Show date even on small screens" into nyc-dev
2016-06-08 19:11:41 +00:00
Jason Monk
4455fc734c
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev
2016-06-08 19:11:16 +00:00
Will Harmon
604c2f9440
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
...
Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
2016-06-08 19:10:57 +00:00
Jason Monk
27eadb6f1d
Merge "Settings: Better handling for disabled tiles" into nyc-dev
2016-06-08 19:10:10 +00:00
Makoto Onuki
c29f62c738
Push DO/PO package names from DPMS to PM
...
Bug 29126573
Change-Id: I95ea1559f6acf5d2f0e1b0953568cdfc938e83b9
2016-06-08 11:52:13 -07:00
fionaxu
7e2c6c3440
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956 am: dc9a7c7b23
...
am: e892848035
2016-06-08 18:41:33 +00:00
Alan Viverette
1bb283131f
Merge \"Return correct default theme on API >= 24\" into nyc-dev
...
am: afaa1e9db1
2016-06-08 18:35:22 +00:00
fionaxu
e892848035
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956
...
am: dc9a7c7b23
2016-06-08 18:33:22 +00:00
Ian Pedowitz
afaa1e9db1
Merge "Return correct default theme on API >= 24" into nyc-dev
2016-06-08 18:28:00 +00:00
fionaxu
afed6f8631
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
...
am: c10e4fae05
2016-06-08 18:24:16 +00:00
Julia Reynolds
5431ee2aca
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
...
am: e1451c4e30
2016-06-08 18:24:04 +00:00
fionaxu
dc9a7c7b23
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours
...
am: 2d03c0f956
2016-06-08 18:22:46 +00:00
Julia Reynolds
e1451c4e30
Merge "Handle alarm firing outside of DND period." into nyc-dev
2016-06-08 18:19:13 +00:00
Felipe Leme
a18a63b23a
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
...
am: fb5995cfbb
2016-06-08 18:16:43 +00:00
Amith Yamasani
c33507d441
Merge \"Add a separate read permission for oem unlock state\" into nyc-dev
...
am: 718f321369
2016-06-08 18:16:40 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
Tianjie Xu
aebec60aa9
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
...
am: 00681d0e78
2016-06-08 18:08:50 +00:00
Aurimas Liutikas
56334c5202
Correct the size of example bitmap for xxhdpi.
...
Bug:
https://code.google.com/p/android/issues/detail?id=156314
Change-Id: Ib95efa2767aa52cb2e11195499828ca41e58eb50
(cherry picked from commit 8c719cece6
2016-06-08 18:06:29 +00:00
Aurimas Liutikas
b7c41c89a2
Remove duplicate the from AppBar documentation.
...
Bug:
https://code.google.com/p/android/issues/detail?id=187156
Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9
(cherry picked from commit bfc3cfdec5
2016-06-08 18:06:01 +00:00
Aurimas Liutikas
29c15361f8
Fix code example in testing-support-library.
...
Note: mDevice is a variable, there is additional brackets.
Bug:
https://code.google.com/p/android/issues/detail?id=206043
Change-Id: I8e88a6144f1ede1d45262ff034159de524c24b70
(cherry picked from commit 6b1853008e
2016-06-08 18:05:49 +00:00
Aurimas Liutikas
2e874fe28c
Fix a link to CustomTabsCallback in support-library docs.
...
Bug:
https://code.google.com/p/android/issues/detail?id=183077
Change-Id: I86d1d8e07e42e9e295364b002e7e1534d4d9d5cc
(cherry picked from commit f82032fcf9
2016-06-08 18:05:33 +00:00
TreeHugger Robot
fb5995cfbb
Merge "Wrap closeQuietly() on finally block." into nyc-dev
2016-06-08 17:59:48 +00:00
Amith Yamasani
718f321369
Merge "Add a separate read permission for oem unlock state" into nyc-dev
2016-06-08 17:55:41 +00:00
Tianjie Xu
00681d0e78
Merge "Change unit of I/O statistics to MiB" into nyc-dev
2016-06-08 17:25:16 +00:00
fionaxu
2d03c0f956
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7
...
am: 16dfcd7950
2016-06-08 17:23:33 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
16dfcd7950
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e
...
am: eb53629bf7
2016-06-08 17:15:39 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
