Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'
* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp
* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
Now camera driver uses ANativeWindow for display.
CameraService should not request preview callback from
camera hardware if applications have not requested it.
bug:2951018
Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'
* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
Only pulse notification light if a new notification has been received since the screen was last turned off
Merge commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e'
* commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e':
Fix to get A2DP to connect after unpairing
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp
* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
Only pulse notification light if a new notification has been received since the screen was last turned off
Merge commit 'a79c82918e3df38197cd4c81d10049401485036e' into gingerbread-plus-aosp
* commit 'a79c82918e3df38197cd4c81d10049401485036e':
Fix to get A2DP to connect after unpairing
This adds the ability to blend with the framebuffer using Darken,
Lighten, Add, Multiply, Overlay and Screen.
Change-Id: Iae01a53797d4ad39c373cba6ff2a42293129da1a
Merge commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434'
* commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434':
Fix for an IndentOutOfBounds in TextField.
Merge commit 'ca1b26150943829a296bf38e55ff9c55dbd98182'
* commit 'ca1b26150943829a296bf38e55ff9c55dbd98182':
Made context menu appear when tapping inside selection.
Merge commit '1ed20dc43b070903597c55738f342bc77f7ab21d'
* commit '1ed20dc43b070903597c55738f342bc77f7ab21d':
Hidden API to control sorting of download manager queries.
Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8'
* commit '049912b76f320c55cfe56394e520ee2c35f913b8':
Fix to get A2DP to connect after unpairing
Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'
* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'
* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
The number of timers to allocate time shares to is calculated by
disregarding system-UID execution. However, the actual allocation
of time *was* considering system-UID locks as well. This wound up
trying to share time across more timers than had been counted in the
first pass, leading to divide-by-zero exceptions.
This patch changes the logic to account the time slice only to
non-system-UID entities, in keeping with the commentary.
Change-Id: I7384a3c269aea44e52bc983927f9417e11613ad5
Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.
Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
