Glenn Kasten
78cbd451fd
Simplify and document AudioTrack gain
...
also deprecate setStereoVolume
Bug: 12534920
Change-Id: I009ab91c5b73b93fbd961691e5764744ce37cae6
2014-04-03 17:45:29 +00:00
Jeff Brown
10a5ec230f
am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
...
* commit 'c2cebee67a2dafe850e39b2ae3bc8b2f44426901':
Clean up certain state transitions in DreamService.
2014-04-03 08:31:33 +00:00
Jeff Tinker
36ba373e09
am 4f342e87: (-s ours) am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
...
* commit '4f342e878d88b1f75a9b487e2aa0582b59e29083':
Add signature|system permission to MediaDrm signer APIs
2014-04-03 08:31:19 +00:00
Jeff Brown
c2cebee67a
am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
...
* commit '8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
Clean up certain state transitions in DreamService.
2014-04-03 03:25:02 +00:00
Jeff Brown
8db6d9af58
Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
2014-04-03 03:20:01 +00:00
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
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
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
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
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
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
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
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
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
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
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
Alan Viverette
8754b73bf8
Merge "Add inverse text styles to public"
2014-04-02 21:11:39 +00:00
Dave Platt
db89fe2a2b
Merge "Document and enforce "one request per Listener" rule"
2014-04-02 21:09:43 +00:00
Ben Cheng
0e2806b171
am 3399ec31: am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '3399ec317d8a318ca384036bc6fecf4656f1f118':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 21:07:25 +00:00
Chris Wren
af31a7d1cc
Merge "add variance to notification usage stats"
2014-04-02 21:03:00 +00:00
Ben Cheng
3399ec317d
am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit 'b386bfd791d77e24bcfe3261420f82b0a9d3851d':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:59:47 +00:00
Chris Wren
5110397488
add variance to notification usage stats
...
Change-Id: I9b6abd08cf01a1d80c8e5dd581c8e82e019542fc
2014-04-02 16:57:56 -04:00
Ben Cheng
b386bfd791
am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '89dddcc948cb3e826bfddeefae73066849aba0fc':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:54:47 +00:00
Ben Cheng
89dddcc948
Merge "Use default visibility for Snapshot::getLocalClip."
2014-04-02 20:51:00 +00:00
Michael Wright
ddbb0a3c33
am 744cf2b9: (-s ours) am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit '744cf2b98f3f643380ab1db53e3d2216ecf9d872':
Misc. buttons aren't gamepad keys.
2014-04-02 20:45:00 +00:00
ztenghui
2766e37d85
Merge "Getting the version information into the VectorDrawable"
2014-04-02 20:39:46 +00:00
Michael Wright
744cf2b98f
am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit '4932a355f1594990173e0d9cd1fa38b8491c4a29':
Misc. buttons aren't gamepad keys.
2014-04-02 20:30:29 +00:00
Michael Wright
4932a355f1
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
2014-04-02 20:26:36 +00:00
Ben Cheng
65ba94f79d
Use default visibility for Snapshot::getLocalClip.
...
The method is in libhwui.so but used by libandroid_runtime.so
(via android_view_GLES20Canvas.cpp). If the compiler decides not to
inline this method, the linker won't be able to resolve the dependency
when it has hidden visibility.
The problem is found when testing GCC 4.9.
Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
2014-04-02 13:26:33 -07:00
Winson Chung
a10370fc2e
Adding system service proxy to help test UI/performance.
...
Change-Id: I29851ff7b7ced0a69b041e5aa5c9070fc4ab43a5
2014-04-02 12:25:04 -07:00