Jeff Brown
344812d2f3
Clean up certain state transitions in DreamService.
...
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately. This ensures that the dream is actually in the
expected state when the callback runs. Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior. As it happens, there's no need
to post this callback since attach() already runs on the UI thread.
Handle certain races involving the window token lifecycle a little
better. When the dream manager shuts down a dream, it removes the
window token. This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown. We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.
Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.
Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
2014-04-02 20:17:32 -07:00
Alan Viverette
031c49ff1c
am aa11084c: Merge "Fix dialog style, selectable item bg pinning, and pressed state"
...
* commit 'aa11084c3ba1bf166febce53ccb9852f72f2a4a5':
Fix dialog style, selectable item bg pinning, and pressed state
2014-04-03 02:38:22 +00:00
Alan Viverette
aa11084c3b
Merge "Fix dialog style, selectable item bg pinning, and pressed state"
2014-04-03 02:33:02 +00:00
Alan Viverette
45dc35b3c9
Fix dialog style, selectable item bg pinning, and pressed state
...
BUG: 13746931
Change-Id: I31c2959f3e773a3aeb66ba5842d8d6fbb288acc1
2014-04-02 19:32:15 -07:00
Jinsuk Kim
53c4d55897
am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
...
* commit 'f60283598751cbbdb65b2a59d2294e23bb4dfb99':
Use build property for CEC device OSD name
2014-04-03 02:17:08 +00:00
Jinsuk Kim
f602835987
am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
...
* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
Use build property for CEC device OSD name
2014-04-03 02:11:40 +00:00
Jinsuk Kim
fe83576b55
am 8ccaedb5: am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit '8ccaedb51b0734d2711b8bf86f6ffeb57a5da172':
Fix build breakage by updating current.txt
2014-04-03 01:44:31 +00:00
Katie McCormick
e547056720
am 62b7e66e: am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '62b7e66e0356810bd11931edf6c14959b70be996':
docs: MediaRouteProvider Developer Guide
2014-04-03 01:44:28 +00:00
Jinsuk Kim
64b1ad5a39
am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
Maintain display power status for playback device
2014-04-03 01:44:24 +00:00
Christopher Tate
4a7000924a
am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid"
...
* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
Refuse update of a system app if it changes its shared uid
2014-04-03 01:44:20 +00:00
Jinsuk Kim
8ccaedb51b
am d66d3e73: am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit 'd66d3e736fa101b48076433bc305971a19bb8f6f':
Fix build breakage by updating current.txt
2014-04-03 01:41:24 +00:00
Katie McCormick
62b7e66e03
am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '035a2bbd8b8720673e068cf06d646e616a10ab34':
docs: MediaRouteProvider Developer Guide
2014-04-03 01:41:20 +00:00
Jinsuk Kim
c9cb91388b
am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
Maintain display power status for playback device
2014-04-03 01:41:13 +00:00
Christopher Tate
a7d9b93756
Merge "Refuse update of a system app if it changes its shared uid"
2014-04-03 01:39:36 +00:00
Chris Craik
49e6c73913
Move most TransformationInfo properties to RenderNode
...
This change dedupes the various properties that were represented both
in TransformationInfo, and RenderProperties on the native side.
RenderNode (and its associated properties) are now permanently
attached to a View in SW or HW. The native copy of these properties
are their sole representation.
Alpha to come in a later CL.
Also fixed issue with copying RenderNode's transform, and added
support of deleting RenderNodes in software rendering.
Change-Id: Ideb6e7f32b780e87aa1c32637c368356b3eee3a1
2014-04-02 18:38:25 -07:00
Jeff Tinker
4f342e878d
am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
...
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
Add signature|system permission to MediaDrm signer APIs
2014-04-03 01:35:28 +00:00
Jeff Tinker
4995d72520
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
2014-04-03 01:30:42 +00:00
Jinsuk Kim
f2fe3505da
am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
...
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
Use build property for CEC device OSD name
2014-04-03 00:39:23 +00:00
Jinsuk Kim
31518f745f
Merge "Use build property for CEC device OSD name" into klp-modular-dev
2014-04-03 00:35:09 +00:00
ztenghui
fba3bad387
Clean up on VectorDrawable.
...
Rename the test from DynamicDrawableTest to VectorDrawableTest.
Remove duplicate function calls in the test.
Fix comments in VectorDrawable
Change-Id: I1ef87137088ccc10b1abdb40ca368345d9dbadab
2014-04-02 17:31:08 -07:00
Christopher Tate
c935d1f111
Refuse update of a system app if it changes its shared uid
...
Bug 13657183
Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
2014-04-02 17:00:04 -07:00
Alan Viverette
01dac4cd5b
am 1970f570: Don\'t use TypedArray after recycling it
...
* commit '1970f570714a4746bf592e26731ea0ee8933d363':
Don't use TypedArray after recycling it
2014-04-02 23:51:27 +00:00
Alan Viverette
1970f57071
Don't use TypedArray after recycling it
...
BUG: 13771701
Change-Id: Ib3ccb270f44cd236ce5294f8d0e01f1922005a3b
2014-04-02 16:46:31 -07:00
Jeff Tinker
65c94e6959
Add signature|system permission to MediaDrm signer APIs
...
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
2014-04-02 16:43:10 -07:00
Jinsuk Kim
d66d3e736f
am 7b4c9725: Merge "Fix build breakage by updating current.txt" into klp-modular-dev
...
* commit '7b4c972577179b2dfcf8a59c31b3730d097c5d46':
Fix build breakage by updating current.txt
2014-04-02 23:17:23 +00:00
Katie McCormick
035a2bbd8b
am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '85588d19bd9fce3d7e837c14e0b9d50cf3a75904':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:17:20 +00:00
Jinsuk Kim
7b4c972577
Merge "Fix build breakage by updating current.txt" into klp-modular-dev
2014-04-02 23:12:09 +00:00
Katie McCormick
85588d19bd
am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:11:20 +00:00
Jinsuk Kim
196b6dd13e
Fix build breakage by updating current.txt
...
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
2014-04-03 08:10:55 +09:00
Katie McCormick
cd536cb329
am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
...
* commit '0cdf60472be5efc1b6e8ef125f96ba014870b345':
docs: MediaRouteProvider Developer Guide
2014-04-02 23:05:04 +00:00
Jinsuk Kim
60b17cc094
Use build property for CEC device OSD name
...
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".
Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.
Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
2014-04-03 07:59:27 +09:00
Katie McCormick
0cdf60472b
Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
2014-04-02 22:58:57 +00:00
Winson Chung
5e3e5d8945
Adding activity icon to the task view
...
- Also fixing issue where the activity icon was being used as the application icon to filter with
2014-04-02 15:44:55 -07:00
Jinsuk Kim
4c963841db
am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
...
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
Maintain display power status for playback device
2014-04-02 22:43:52 +00:00
Alan Viverette
8246270b53
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:07 +00:00
Jinsuk Kim
b1dca1624d
Merge "Maintain display power status for playback device" into klp-modular-dev
2014-04-02 22:39:41 +00:00
Alan Viverette
e3c38a0b0e
Fix recents theme, add missing headers
...
Change-Id: Ib8eea6153eaf7e0e93e54c69fe59e63e98a409a6
2014-04-02 15:39:13 -07:00
Alan Viverette
941177af98
am 09ec3e30: Merge "Disable content transitions, they are not implemented yet"
...
* commit '09ec3e30b71d0bd8d5b711ffd68fbeb27a0930fb':
Disable content transitions, they are not implemented yet
2014-04-02 22:37:23 +00:00
Joe Fernandez
55b38fadd0
docs: MediaRouteProvider Developer Guide
...
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
2014-04-02 15:35:15 -07:00
Alan Viverette
09ec3e30b7
Merge "Disable content transitions, they are not implemented yet"
2014-04-02 22:31:21 +00:00
Alan Viverette
3a3395042e
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Winson Chung
6ec89da16e
am ceb9b437: Merge "Adding system service proxy to help test UI/performance."
...
* commit 'ceb9b437f701f68411fcbef7e83b5df45834f9d9':
Adding system service proxy to help test UI/performance.
2014-04-02 22:18:55 +00:00
Alan Viverette
b325345ef0
Merge "Switch framework Holo references to Quantum.Light"
2014-04-02 22:15:16 +00:00
Winson Chung
ceb9b437f7
Merge "Adding system service proxy to help test UI/performance."
2014-04-02 22:14:19 +00:00
Alan Viverette
255e7d83b6
Disable content transitions, they are not implemented yet
...
BUG: 13745751
Change-Id: I5d3c7c2f679084b7a161b7233e18264056eee211
2014-04-02 15:14:03 -07:00
Jorim Jaggi
ae6ffcc3c7
Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev
2014-04-02 21:22:59 +00:00
Alan Viverette
ab6e111634
am 8754b73b: Merge "Add inverse text styles to public"
...
* commit '8754b73bf81aa0164f3e2a1a429ba0fda39202de':
Add inverse text styles to public
2014-04-02 21:13:25 +00:00
Dave Platt
8f7f613b2a
am db89fe2a: Merge "Document and enforce "one request per Listener" rule"
...
* commit 'db89fe2a2b7932f013f7a2dd136324c3daeee253':
Document and enforce "one request per Listener" rule
2014-04-02 21:13:21 +00:00
Ben Cheng
56b7d1401a
am 0e2806b1: am 3399ec31: am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '0e2806b171f135de35153a106d18d86646f4d1c0':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 21:13:18 +00:00
Alan Viverette
8754b73bf8
Merge "Add inverse text styles to public"
2014-04-02 21:11:39 +00:00