Philip Cuadra
5fcabe19a7
Merge "Pinner service for pinning files into memory" into nyc-dev
...
am: b41088b4df
* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
Pinner service for pinning files into memory
Change-Id: I404f6844fb5bf4a097d3d862a9294cb58484d176
2016-05-12 22:04:36 +00:00
Philip Cuadra
b41088b4df
Merge "Pinner service for pinning files into memory" into nyc-dev
2016-05-12 21:55:29 +00:00
Dimitry Ivanov
69efd6c0c2
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
...
am: 7f0708390b
* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
Move Vulkan layer path setup to ApplicationLoaders
Change-Id: I1adef3e79249cea465a3043c39bccd07dbfe805a
2016-05-12 21:21:23 +00:00
Jesse Hall
7f0708390b
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
2016-05-12 21:13:26 +00:00
Adrian Roos
f46fdf877e
Merge "DPM control for remote input when locked" into nyc-dev
...
am: 11c8f5315b
* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
DPM control for remote input when locked
Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b
Merge "DPM control for remote input when locked" into nyc-dev
2016-05-12 20:52:26 +00:00
Philip Cuadra
7bd0fdd639
Pinner service for pinning files into memory
...
Pin key files into memory to prevent having to fetch from flash
after boot. Improves system performance by preventing page cache
thrash. Retrieves files from a device-specific overlay to allow
specialization.
bug 28251566
Change-Id: I8532f52bd70271794dd7576976d13a524849ce7b
2016-05-12 13:12:20 -07:00
Tingting Wang
7531057944
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
...
am: 752129929f
* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
Rename CONTACT_METADATA_SYNC GService Flag.
Change-Id: I93f0b86af829eafa6e8425b360a323c48df67776
2016-05-12 17:24:20 +00:00
Tingting Wang
752129929f
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
2016-05-12 17:11:44 +00:00
Makoto Onuki
26edcba2c9
Merge "Remove ShortcutManager" into nyc-dev
2016-05-12 16:32:56 +00:00
Alan Viverette
941bbd4eb7
Merge "Remove extra logging in DatePicker" into nyc-dev
...
am: c952b035b2
* commit 'c952b035b27c858a8d0c794282146f5dd31020e9':
Remove extra logging in DatePicker
Change-Id: I69aa4f977bc8f3d31872f69f735d96188830043e
2016-05-12 15:02:36 +00:00
Alan Viverette
c952b035b2
Merge "Remove extra logging in DatePicker" into nyc-dev
2016-05-12 14:57:58 +00:00
Chris Wren
d328afff96
Merge "document the return type of getImportance" into nyc-dev
...
am: 3041d49d88
* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
document the return type of getImportance
Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
2016-05-12 13:00:45 +00:00
Chris Wren
3041d49d88
Merge "document the return type of getImportance" into nyc-dev
2016-05-12 12:53:51 +00:00
Dimitry Ivanov
0997908c95
Move Vulkan layer path setup to ApplicationLoaders
...
ThreadedRenderer was never the right place for this anyway, and
ApplicationLoaders can provide both the full library search path (not
just the extracted native library dir) as well as the application loader
namespace.
Bug: 28213888
Change-Id: Ibcc0a9178da4dba6f3f3105932fdac1a1d0261af
2016-05-11 22:59:10 -07:00
Jorim Jaggi
1e35919a09
Merge "Fix smallest width configuration calculation" into nyc-dev
...
am: 63c09fd6cd
* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
Fix smallest width configuration calculation
Change-Id: Iaca06abab9336d15fab5b2ec302a7a821e8f0103
2016-05-12 01:55:13 +00:00
Jorim Jaggi
63c09fd6cd
Merge "Fix smallest width configuration calculation" into nyc-dev
2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3
Fix smallest width configuration calculation
...
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.
In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.
Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
Adam Lesinski
ebfb372876
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
* commit '3723194dc831f4734d465602b2e21449d9357c2e':
BluetoothManager: Make requestControllerActivityInfo one call
Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
2016-05-12 00:59:29 +00:00
Dianne Hackborn
9f073e94e0
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
...
am: b3edcd78d2
* commit 'b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
Fix issue #28400000 : Settings memory UI still showing z-ram...
Change-Id: Iabd4b29208f3a26e78d4773033a7653738dc471d
2016-05-12 00:50:34 +00:00
Dianne Hackborn
b3edcd78d2
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
2016-05-12 00:40:18 +00:00
Aurimas Liutikas
462c3ba3ef
Merge "Stop saving ActionMenuItemView state." into nyc-dev
...
am: b9bb8e88c6
* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
Stop saving ActionMenuItemView state.
Change-Id: If218724b1a04381934e7591381e15ad262095a7d
2016-05-12 00:38:53 +00:00
Jim Miller
ca299c6fbd
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
...
am: 254d9e4f41
* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
Fix KeyguardManager.isSecure() to observe work profile
Change-Id: I92f1387372cd02790f10f2940fdeb97ec6ab4a8f
2016-05-12 00:38:38 +00:00
TreeHugger Robot
b9bb8e88c6
Merge "Stop saving ActionMenuItemView state." into nyc-dev
2016-05-11 23:54:41 +00:00
Jim Miller
254d9e4f41
Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
2016-05-11 23:45:09 +00:00
Yigit Boyar
8e03a859cc
Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
...
am: 1a97cbd4ca
* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
Fully detach unused scrap views
Remove detached headers
Change-Id: I8ab90fd32e4dabf61f7becd0897742a5e637f8ab
2016-05-11 22:42:09 +00:00
Yigit Boyar
1a97cbd4ca
Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
...
* changes:
Fully detach unused scrap views
Remove detached headers
2016-05-11 22:32:05 +00:00
Aurimas Liutikas
9c661a40c1
Stop saving ActionMenuItemView state.
...
There is no useful state to be saved for these views.
This fixes a crash where we try to restore the state of an
ActionView (that shares the same ID as ActionMenuItemView).
Framework version of ag/1020805
Bug: 28110832
Change-Id: I4a09786a1c08bef1765fd8be3affb21dce296272
2016-05-11 14:46:47 -07:00
Adam Powell
8dd12a52cc
Merge "Less lazy child FragmentManager creation" into nyc-dev
...
am: 6437dac3d9
* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
Less lazy child FragmentManager creation
Change-Id: I64e044e21b86f3015ab251780952c5b157b2b1e9
2016-05-11 21:41:43 +00:00
Adam Powell
6437dac3d9
Merge "Less lazy child FragmentManager creation" into nyc-dev
2016-05-11 21:32:57 +00:00
Makoto Onuki
538c440c33
Remove ShortcutManager
...
Bug 28704708
Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Dianne Hackborn
ef0a402f58
Fix issue #28400000 : Settings memory UI still showing z-ram...
...
...but probably shouldn't.
Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.
Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Alan Viverette
efb8e576a9
Remove extra logging in DatePicker
...
Issue seems to be fixed now, don't need the extra logging.
Bug: 27310206
Change-Id: Ibf53d056e9c5144729dae02c72050aebd90e4343
2016-05-11 17:10:13 -04:00
Adam Powell
467cc6f0e1
Less lazy child FragmentManager creation
...
Framework edition
Fix a bug where child FragmentManagers moving too lazily into the
CREATED state and beyond caused child fragments to not be
attached/created when expected.
Bug 25019275
Change-Id: I04ff0d3bcb693178a6ee3057da591392defdbcf8
2016-05-11 13:45:33 -07:00
Adrian Roos
7f06eed7f5
DPM control for remote input when locked
...
Bug: 26981262
Change-Id: I84f26ebe807e89fd56ffc3bbc7fc20f12e2f7391
2016-05-11 19:54:09 +00:00
Julia Reynolds
47e0d29473
Merge "Do not bundle cross user." into nyc-dev
...
am: 68a32b5aad
* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
Do not bundle cross user.
Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
2016-05-11 17:26:59 +00:00
Julia Reynolds
68a32b5aad
Merge "Do not bundle cross user." into nyc-dev
2016-05-11 17:20:16 +00:00
Robert Carr
965c343065
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
...
am: a625b0b597
* commit 'a625b0b5976c17d8efabcf348613db7fda3e56cf':
PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS
Change-Id: Ia2bb751cd9864ed10e5ee5d38c7bea4d91527b2e
2016-05-11 16:48:28 +00:00
Chris Wren
5ab5c748a8
document the return type of getImportance
...
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
2016-05-11 12:44:58 -04:00
Rob Carr
a625b0b597
Merge "PopupWindow: Be more careful with FLAG_LAYOUT_NO_LIMITS" into nyc-dev
2016-05-11 16:44:16 +00:00
Julia Reynolds
eae43fbd17
Do not bundle cross user.
...
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
2016-05-11 10:59:53 -04:00
Clara Bayarri
9550f5dfa6
Fix crash in ResolverActivity
...
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
(cherry picked from commit b53b2bd088 )
2016-05-11 14:57:37 +00:00
Todd Kennedy
9580593e5d
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
Fix secondary ABI instrumetion
Change-Id: I0ad719338b8cbcf9cf90526d2e0196aa25ff07ad
2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936
Merge "Fix secondary ABI instrumetion" into nyc-dev
2016-05-11 14:35:19 +00:00
Greg Kaiser
5662120923
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
GradientColor: Fix typo in documentation.
Change-Id: I647222141e85163cefe2241a96439f0eb3d7a97a
2016-05-11 12:39:34 +00:00
Greg Kaiser
a452dd3fd9
Merge "GradientColor: Fix typo in documentation." into nyc-dev
2016-05-11 12:32:18 +00:00
Jim Miller
e4044bb617
Fix KeyguardManager.isSecure() to observe work profile
...
The fix passes the calling userId instead of the current userId to
allow apps running as managed profiles to work.
Fixes bug 28666104
Change-Id: I9f8676ab11bd581d9e67b2b9f385036d4d3576ee
2016-05-10 18:38:25 -07:00
Jeff Sharkey
bd92d3c267
Merge "Fail upgrades that change storage devices." into nyc-dev
...
am: 1fdeb5bdf7
* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
Fail upgrades that change storage devices.
Change-Id: I88868123f5122c039a9aea19b6fdd9ecae089972
2016-05-11 01:07:22 +00:00
TreeHugger Robot
1fdeb5bdf7
Merge "Fail upgrades that change storage devices." into nyc-dev
2016-05-11 01:02:32 +00:00