Jae Seo
b2eed1d6e1
Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
2015-07-20 23:59:25 +00:00
Terry Heo
e95af4ab8b
Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
2015-07-20 23:57:31 +00:00
Miao Wang
37353dc13e
Merge "[RenderScript] Add docs advising users about dstAtop bug."
2015-07-20 23:57:19 +00:00
Dongwon Kang
14bdaa7f6b
am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
...
* commit '6444fe121449f1cacf4500d3098b590c74e3646d':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
2015-07-20 23:56:37 +00:00
Jorim Jaggi
c0469f9972
am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
...
* commit '55786e1164d522d878d1f493c30330669b1fd868':
Test app to emit all AccessibilityEvents to logcat.
2015-07-20 23:56:33 +00:00
Jorim Jaggi
537cd82ad5
am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
...
* commit '027db7c90a2bfde65069dece1c1a4519e246c202':
Fix SysUI crashes on svelte devices
2015-07-20 23:54:19 +00:00
Dongwon Kang
6444fe1214
Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
2015-07-20 23:50:03 +00:00
Alan Viverette
1e3da911f1
am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
...
* commit 'd9fa0fd7f3b98473474103ac93ec6ca02455c8b0':
Adjust padding and font size in time picker for Large text mode
2015-07-20 23:47:07 +00:00
Alan Viverette
c447689d27
am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '872cb95cf211b6d30c8ac6f7670bbd5de19d33cb':
Add missing invalidation check to drawable cache
2015-07-20 23:47:01 +00:00
Jorim Jaggi
7cc56bb44d
am 1f98c62f: Fix unnecessary layer creation for appear animation
...
* commit '1f98c62f9a60fedd8f18bd47e3f3c4e5fcb34031':
Fix unnecessary layer creation for appear animation
2015-07-20 23:45:46 +00:00
Miao Wang
6005f9e5ae
am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
...
* commit '15d6894170f2ee1a6eae57c915fcc27a56c9de17':
[RenderScript] Add docs advising users about dstAtop bug.
2015-07-20 23:45:42 +00:00
Jorim Jaggi
00fe1b650a
am 4cd72169: Fix window animation flickering
...
* commit '4cd7216967a3e6211785c8acdeca449d61d796a0':
Fix window animation flickering
2015-07-20 23:45:37 +00:00
Miao Wang
37e1d0ce1e
[RenderScript] Add docs advising users about dstAtop bug.
...
Bug: 22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
(cherry picked from commit ffb1a9bed0788d3547f085bfb9d254004e0db1e3)
2015-07-20 16:44:14 -07:00
Jorim Jaggi
55786e1164
Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
2015-07-20 23:43:51 +00:00
Jorim Jaggi
027db7c90a
am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
...
* commit 'e58ba842de4324c62b7e527f0b90fc6ee5ccba13':
Fix SysUI crashes on svelte devices
2015-07-20 23:40:00 +00:00
Jorim Jaggi
1f98c62f9a
Fix unnecessary layer creation for appear animation
...
Bug: 22561692
Change-Id: I9e5a52f8113d1cbb5afba61d7979770c2dddc5ed
2015-07-20 23:39:46 +00:00
Jeff Sharkey
54d42be6eb
Avoid NPE when no staged installs.
...
listFiles() returns null instead of empty list; deal with it.
Bug: 22608671
Change-Id: I60dabec31932af3cded915c6927a4c5e5c71775d
2015-07-20 16:37:54 -07:00
Miao Wang
15d6894170
Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
2015-07-20 23:37:48 +00:00
Alan Viverette
d9fa0fd7f3
am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
...
* commit '6ae0a992c8f2a58881f20adcd1e5bc796e85aeef':
Adjust padding and font size in time picker for Large text mode
2015-07-20 23:33:02 +00:00
Alan Viverette
872cb95cf2
am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '9362d96a26954aed897badecf7e0c6222e01e9e8':
Add missing invalidation check to drawable cache
2015-07-20 23:32:56 +00:00
Jorim Jaggi
4cd7216967
Fix window animation flickering
...
Bug: 22502673
Change-Id: I939e5840e10f3c0582148a5a01908076f994ae69
2015-07-20 23:31:25 +00:00
Simranjit Singh Kohli
976b0428c5
am 6bd77bf8: am af12538d: am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should mak
...
* commit '6bd77bf8a224bc57eaadfb2256f8fc0bc20ac50e':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
2015-07-20 23:31:00 +00:00
Dianne Hackborn
d9c5769e1b
am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit '0f8d156efa70b4bd3025c1a666d20801bd2485f6':
Fix issue #22564918 : Request is inactive
2015-07-20 23:30:54 +00:00
Jorim Jaggi
b6be47fde3
am 32909b4a: am 918ca968: am 7800a1f8: am 86b273f1: Fix jank in swipe-up to unlock
...
* commit '32909b4a448dd157c73588cfd8b5bf1cc3cb0230':
Fix jank in swipe-up to unlock
2015-07-20 23:26:14 +00:00
Jorim Jaggi
e58ba842de
am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
...
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
Fix SysUI crashes on svelte devices
2015-07-20 23:24:21 +00:00
Raph Levien
ea2b4a40f7
Respect style boundaries when measuring text
...
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.
This patch changes the invocation of getRunAdvance to measure only
within the style span.
Bug: 22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
2015-07-20 16:22:01 -07:00
Jae Seo
4f1a6d477c
TIF: Get or create the user state when failed to find existing one
...
Bug: 22560640
Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
2015-07-20 16:20:18 -07:00
Alan Viverette
6ae0a992c8
am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
...
* commit '23305e9f54207f5c945dfda7f0d576871f50b917':
Adjust padding and font size in time picker for Large text mode
2015-07-20 23:15:23 +00:00
Alan Viverette
9362d96a26
am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '783b3d9d0954f7bba5f69ed7a15af61c55af7cfc':
Add missing invalidation check to drawable cache
2015-07-20 23:15:19 +00:00
Simranjit Singh Kohli
6bd77bf8a2
am af12538d: am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they a
...
* commit 'af12538d5915e2c741d95dfedcd30b4523e84f7a':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
2015-07-20 23:14:24 +00:00
Dianne Hackborn
0f8d156efa
am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit '5c97a4bad59cf7b6f8cd8599c49bf79b78b42564':
Fix issue #22564918 : Request is inactive
2015-07-20 23:14:19 +00:00
Jorim Jaggi
8924f23d3e
Merge "Fix SysUI crashes on svelte devices" into mnc-dev
2015-07-20 23:09:46 +00:00
Miao Wang
ffb1a9bed0
[RenderScript] Add docs advising users about dstAtop bug.
...
Bug: 22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
2015-07-20 16:04:59 -07:00
Simranjit Singh Kohli
af12538d59
am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it
...
* commit '7b36e3adf58b99c06bbe8691132fb6e32bb445bc':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
2015-07-20 23:01:52 +00:00
Dianne Hackborn
5c97a4bad5
am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit '609cb5853362a742870b70d1234afdae62e2ff62':
Fix issue #22564918 : Request is inactive
2015-07-20 23:01:48 +00:00
Dongwon Kang
500747bf8f
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
...
AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called
in MSR.adjustVolume() which is called from MediaSessionService while holding a
lock.
Bug: 22606983
Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c
2015-07-20 15:59:53 -07:00
Alan Viverette
23305e9f54
am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
...
* commit '41668b259dfa997492e3f4d331fee88b7f9f2453':
Adjust padding and font size in time picker for Large text mode
2015-07-20 22:59:37 +00:00
Alan Viverette
783b3d9d09
am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '001f1e7eb35630df24d53298c1a3d2de055d7ce9':
Add missing invalidation check to drawable cache
2015-07-20 22:59:33 +00:00
Qiwen Zhao
06e260b8db
Merge commit '01fda527'
...
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
2015-07-20 15:52:23 -07:00
Jorim Jaggi
32909b4a44
am 918ca968: am 7800a1f8: am 86b273f1: Fix jank in swipe-up to unlock
...
* commit '918ca96867c2a44a0e1759b9c41b73835e815450':
Fix jank in swipe-up to unlock
2015-07-20 22:51:00 +00:00
Alan Viverette
41668b259d
Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
2015-07-20 22:48:28 +00:00
Jorim Jaggi
e446dcee8f
Fix SysUI crashes on svelte devices
...
Bug: 22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
2015-07-20 15:47:15 -07:00
Alan Viverette
001f1e7eb3
Merge "Add missing invalidation check to drawable cache" into mnc-dev
2015-07-20 22:44:47 +00:00
Simranjit Singh Kohli
7b36e3adf5
am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after cleari
...
* commit '02aff29c396373acc16be159c8c4ed59f61faaed':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
2015-07-20 22:44:18 +00:00
Jorim Jaggi
fa79691209
am 37dbafd1: am b63c22e4: am c0c20b26: am f8763581: Allow navigation bar drawing during window animations
...
* commit '37dbafd1d9f52c00a79ab3ea0c5579f502b4c663':
Allow navigation bar drawing during window animations
2015-07-20 22:44:14 +00:00
Dianne Hackborn
609cb58533
am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit 'a7ce23440328e63f36a4add05199aa84ff04032d':
Fix issue #22564918 : Request is inactive
2015-07-20 22:44:13 +00:00
Nick Kralevich
2fedc4df51
UsbDeviceManager: add back support for USB overlays
...
Commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB
overlays. Add it back in, as some devices depend on it.
Bug: 22062484
Bug: 21195124
Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
2015-07-20 15:40:54 -07:00
Simranjit Singh Kohli
02aff29c39
Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity." into mnc-dev
2015-07-20 22:40:03 +00:00
Jorim Jaggi
918ca96867
am 7800a1f8: am 86b273f1: Fix jank in swipe-up to unlock
...
* commit '7800a1f8791e32e7efef9ab917815ea2fa1b8315':
Fix jank in swipe-up to unlock
2015-07-20 22:36:47 +00:00
Dianne Hackborn
a7ce234403
Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
2015-07-20 22:34:49 +00:00