OSDN Git Service
Erik Wolsheimer [Wed, 29 Jun 2016 23:07:36 +0000 (23:07 +0000)]
Merge "Handle invalid empty args to createAutoBrightnessSpline" into nyc-mr1-dev
Bert McMeen [Wed, 29 Jun 2016 22:08:37 +0000 (22:08 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf
am:
ae5a14bc99
Change-Id: I9b4cbe91c44194d764550b63ddd94b6e2e19f808
Bert McMeen [Wed, 29 Jun 2016 21:59:31 +0000 (21:59 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55
am:
7a6494aeaf
Change-Id: I907cf418d0a53827a7448135b0d712f41d0024e8
Jack Yu [Wed, 29 Jun 2016 21:57:35 +0000 (21:57 +0000)]
Merge "Added a virtual interface for Video Telephony call usage counting" into nyc-mr1-dev
Bert McMeen [Wed, 29 Jun 2016 21:54:42 +0000 (21:54 +0000)]
Docs: Links added to pages for permissions and configuration activity
am:
cdfe5e4f55
Change-Id: I3e9cde3cb24c5c779059c4708b144a2376c9616c
Daniel Nishi [Wed, 29 Jun 2016 21:37:05 +0000 (21:37 +0000)]
Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev
Erik Wolsheimer [Tue, 28 Jun 2016 21:51:07 +0000 (14:51 -0700)]
Handle invalid empty args to createAutoBrightnessSpline
BUG:
18572096
Change-Id: I9dfc2215994a4f7a70ef6bdd04b620917e4ec034
Dianne Hackborn [Wed, 29 Jun 2016 20:50:52 +0000 (20:50 +0000)]
Merge \"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am:
205bc262ce
Change-Id: I3d7186834028be519b512fbcb2240d2ff692f564
Dianne Hackborn [Wed, 29 Jun 2016 20:38:17 +0000 (20:38 +0000)]
Merge "Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API" into nyc-dev
Eric Schmidt [Wed, 29 Jun 2016 20:38:04 +0000 (20:38 +0000)]
Merge \"docs: Edits to Instant Apps FAQs, index page.\" into nyc-dev
am:
7a4d857c45
Change-Id: Id3978a63dc42beb9a92ecde46e1b09e4c32c74c0
TreeHugger Robot [Wed, 29 Jun 2016 20:31:02 +0000 (20:31 +0000)]
Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev
Mukesh Agrawal [Wed, 29 Jun 2016 20:28:40 +0000 (20:28 +0000)]
Merge "wifi: allow config of default+verbose ring buffers" into nyc-mr1-dev
David Friedman [Wed, 29 Jun 2016 20:26:41 +0000 (20:26 +0000)]
Merge "docs: Edits to Instant Apps FAQs, index page." into nyc-dev
Alex Light [Wed, 29 Jun 2016 20:26:04 +0000 (20:26 +0000)]
Merge "cp preopted files from B partition during PM init." into nyc-mr1-dev
Rebecca Silberstein [Wed, 29 Jun 2016 20:15:59 +0000 (20:15 +0000)]
Merge changes from topic 'cherrypickWifiWatchdogResetOnTrigger' into nyc-mr1-dev
* changes:
DO NOT MERGE StateMachine: remove final from SendMessage
DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD
Sid Soundararajan [Wed, 29 Jun 2016 20:13:48 +0000 (20:13 +0000)]
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am:
10b2fee05f
Change-Id: I8b7783bbe4924437494f0ed5857ee81f574fe8b1
Sid Soundararajan [Wed, 29 Jun 2016 20:02:51 +0000 (20:02 +0000)]
Merge "Recents: Make sure blacklist checks the package name as well as activity name" into nyc-dev
Sid Soundararajan [Wed, 29 Jun 2016 18:57:21 +0000 (11:57 -0700)]
Recents: Make sure blacklist checks the package name as well as activity name
BUG:
28719274
BUG:
28764678
Change-Id: Ib17d3feda8997ce5b29060bff47d51f503c868dc
TreeHugger Robot [Wed, 29 Jun 2016 19:29:45 +0000 (19:29 +0000)]
Merge "Have wallpaper target itself when dismissing keyguard with wallpaper" into nyc-mr1-dev
Jack Yu [Wed, 22 Jun 2016 18:35:10 +0000 (11:35 -0700)]
Added a virtual interface for Video Telephony call usage counting
1. Added a virtual VT interface.
2. Qeury VT usage from telephony service.
bug:
20888836
Change-Id: I3df0c22922f8394554230b53f8ae091e17c95595
Dianne Hackborn [Wed, 29 Jun 2016 18:48:14 +0000 (11:48 -0700)]
Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
Alan Viverette [Wed, 29 Jun 2016 17:01:21 +0000 (17:01 +0000)]
Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev
am:
f66bdf9b57
Change-Id: I0c6397987d926c35cb5486fd9d2cb22efb8d8f14
Alan Viverette [Wed, 29 Jun 2016 16:54:28 +0000 (16:54 +0000)]
Merge "Disable constant state sharing for VectorDrawable" into nyc-dev
Chong Zhang [Wed, 29 Jun 2016 16:48:33 +0000 (16:48 +0000)]
Merge "Fix off-by-one in am start -R (repeat)" into nyc-mr1-dev
Fyodor Kupolov [Wed, 29 Jun 2016 15:59:47 +0000 (15:59 +0000)]
Merge "Fixed race condition by using a separate counter" into nyc-mr1-dev
Julia Reynolds [Wed, 29 Jun 2016 15:41:43 +0000 (15:41 +0000)]
Merge "Check uid for notification policy access." into nyc-mr1-dev
Alan Viverette [Wed, 29 Jun 2016 15:32:13 +0000 (11:32 -0400)]
Disable constant state sharing for VectorDrawable
Bug:
29854240
Change-Id: Icc58d04ad6f471d05b085a9089893e4f7205eb7d
Amith Yamasani [Wed, 29 Jun 2016 15:18:33 +0000 (15:18 +0000)]
Merge "An API to check if running in a demo user" into nyc-mr1-dev
Julia Reynolds [Wed, 29 Jun 2016 12:43:00 +0000 (08:43 -0400)]
Check uid for notification policy access.
Bug:
29421441
Change-Id: Ia0a7b06112dde1c925ec3232f50bf4d90b17b5e5
Chia-I Wu [Wed, 29 Jun 2016 07:39:01 +0000 (07:39 +0000)]
Merge "Use the first Vulkan layer path" into nyc-mr1-dev
Hugo Benichi [Tue, 31 May 2016 23:50:38 +0000 (08:50 +0900)]
Adding tests for DnsEventListenerService
Bug:
29035129
Change-Id: Iaf0d9ec781da7a473b6f7d8623060ecde44b9cbd
Hugo Benichi [Tue, 31 May 2016 07:28:06 +0000 (16:28 +0900)]
Refactor IP connectivity event logging
This patch removes static methods for logging IP connectivity events
defined in android.net.metrics and replaces them with a single log()
instance method defined on IpConnectivityLog. Event constructors are
now public also. Every classes logging such events now create an
instance of IpConnectivityLog for logging event objects directly
instantiated with new.
Removing static dependencies allow straightforward testing of logging.
This patch also removes the base IpConnectivityEvent class which is not
needed any more.
Bug:
29035129
Change-Id: I3de700f93f46deaa48a759f938f7d00e1d8bff98
Robert Carr [Wed, 29 Jun 2016 03:33:24 +0000 (03:33 +0000)]
Merge \"Only use one SurfaceControlWithBackground per AppToken.\" into nyc-dev
am:
55427a6650
Change-Id: I8f4eae6fe2ab09cd0b14473cba7d4dbbc42dc469
Rob Carr [Wed, 29 Jun 2016 03:27:47 +0000 (03:27 +0000)]
Merge "Only use one SurfaceControlWithBackground per AppToken." into nyc-dev
Robert Carr [Wed, 29 Jun 2016 00:32:37 +0000 (17:32 -0700)]
Only use one SurfaceControlWithBackground per AppToken.
In the past, if an app never renders to a SurfaceView, it will be
invisible despite having FLAG_OPAQUE. This means an app could leave a
totally empty SurfaceView (never drawing in to it) on top of a second
SurfaceView, and expect the second one to be visible. This is probably
buggy app behavior because FLAG_OPAQUE means if they ever draw anything at all
in to the top SurfaceView the bottom one will become totally invisible.
However this has worked in the past, so we have to preserve things for
apps. To accomplish this we ensure only the bottom most visible
SurfaceView for a given AppToken will receive a background. We achieve
this by synchronizing through the app token whenever visibility or
layering of a SurfaceView changes.
Bug:
29580298
Change-Id: I0023326323cb961b56404fd49093384e7b72aa54
Winson [Wed, 29 Jun 2016 02:20:33 +0000 (02:20 +0000)]
Move preloading to boot complete.
am:
16ef39a7f6
Change-Id: Idaf6c79e076a6b2a1c2d2a2b7282e58bb7c23bce
Winson [Wed, 29 Jun 2016 01:25:15 +0000 (18:25 -0700)]
Move preloading to boot complete.
Bug:
29320695
Change-Id: I14b5127b218597f3c32e647e0443a88b5a708ce1
TreeHugger Robot [Wed, 29 Jun 2016 01:38:01 +0000 (01:38 +0000)]
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
* changes:
Improving the Reset Demo Warning dialog
Enabling auto-ota in retail demo mode
TreeHugger Robot [Wed, 29 Jun 2016 01:29:39 +0000 (01:29 +0000)]
Merge "Prevent PrintSpooler from being disabled" into nyc-mr1-dev
Chong Zhang [Wed, 29 Jun 2016 00:35:18 +0000 (17:35 -0700)]
Fix off-by-one in am start -R (repeat)
bug:
26028552
Change-Id: I075b378b6f126d124d867282d76a78d865b54178
Chong Zhang [Wed, 29 Jun 2016 01:03:26 +0000 (01:03 +0000)]
Merge "Add a few trace points for animation loading." into nyc-mr1-dev
Jim Miller [Wed, 29 Jun 2016 00:45:08 +0000 (00:45 +0000)]
Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am:
60c04126c9
Change-Id: I28a3559159340d663693976cc58dc34f3c730f6c
Jim Miller [Wed, 29 Jun 2016 00:37:41 +0000 (00:37 +0000)]
Merge "Relax security constraint around getAuthenticatorId()." into nyc-dev
Fyodor Kupolov [Wed, 29 Jun 2016 00:37:09 +0000 (17:37 -0700)]
Fixed race condition by using a separate counter
Otherwise a broadcast item replies before the loop completes causing
curWaitingUserSwitchCallbacks to be erroneously empty triggering a
premature call to sendContinueUserSwitchLocked.
Bug:
29039588
Change-Id: I48f48ef68c178166d3473b898346f516905ee70c
Hugo Benichi [Wed, 29 Jun 2016 00:15:48 +0000 (00:15 +0000)]
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
* changes:
Add tests for MetricsLoggerService
Tests for IpConnectivityMetricsLog
Amith Yamasani [Tue, 28 Jun 2016 23:13:15 +0000 (16:13 -0700)]
An API to check if running in a demo user
Add an API to query if the calling app is running
in a demo user sandbox. This allows apps to customize
the starting experience to a potential customer.
Change-Id: I50e40f9a8c66da4b5672c1dc64606d7bedba3f8c
Fixes:
29833923
Wale Ogunwale [Tue, 28 Jun 2016 23:27:31 +0000 (16:27 -0700)]
Have wallpaper target itself when dismissing keyguard with wallpaper
We were previous setting the top app window as the wallpaper target
when the keygaurd is animating away with the wallpaper. This causes
a window that doesn't have the flag to show wallpaper behind it to
become the wallpaper target and it remains the target as long as
there are no window movements. Instead we can make the wallpaper
window target itself during this transition.
Bug:
29092234
Change-Id: If4e3972e7012c6605b1f9dfb9234ceda8db8738b
Suprabh Shukla [Tue, 28 Jun 2016 01:56:23 +0000 (18:56 -0700)]
Improving the Reset Demo Warning dialog
Removing explicit call to setView which was distorting the layout
of a standard AlertDialog. Used the correct unicode characted for
apostrophe. Also removed calls to enable demo mode launcher for user 0.
Bug:
29520255
Change-Id: Id876f01f8e51c02634c03fce1ea93a15b111fc27
Jim Miller [Tue, 28 Jun 2016 23:43:57 +0000 (16:43 -0700)]
Relax security constraint around getAuthenticatorId().
Fixes bug
28603656
Change-Id: I54216d4b9a3ab23f9d5bfe0f40f2dd27e723c21e
Philip P. Moltmann [Tue, 28 Jun 2016 21:14:06 +0000 (14:14 -0700)]
Prevent PrintSpooler from being disabled
Change-Id: I40fb7b25174a41d04f767fbf8ee1da8c02e7156a
Fixes:
29830022
Bert McMeen [Tue, 28 Jun 2016 23:24:13 +0000 (16:24 -0700)]
Docs: Links added to pages for permissions and configuration activity
Bug:
28864917
Change-Id: Ieab325f20dac3bba6028e5c70813d4035063d0cf
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast
Bug:
29754520
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
Chong Zhang [Tue, 28 Jun 2016 22:25:07 +0000 (15:25 -0700)]
Add a few trace points for animation loading.
Also make sure focusMayChange is set as before commit 8c5d42.
We only want to skip the applyAnimationLocked if animation is
already set, make sure the rest are equivalent.
bug:
29405575
Change-Id: I8342b82d9e6e02fab002e16ffcde4a7479bf6867
Chia-I Wu [Tue, 28 Jun 2016 00:39:33 +0000 (08:39 +0800)]
Use the first Vulkan layer path
The loader will scan the current layer path once when the first valid
Vulkan command call is made. To avoid confusions and data races, never
set the layer path more than once.
This assumes the first layer path to be the app's library search path,
which should be the case.
Bug:
29780602
Change-Id: Ibb9e4de95902ee89413d213d237ea4f62ea35b38
Rebecca Silberstein [Fri, 13 May 2016 20:57:34 +0000 (13:57 -0700)]
DO NOT MERGE StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development. This allows tests to verify calls to
sendMessage and sendMessageDelayed.
Also fixed one checkstyle error with import order.
BUG:
28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
Rebecca Silberstein [Thu, 19 May 2016 23:18:36 +0000 (16:18 -0700)]
DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD
(cherry-pick from master)
Add a WifiLock mode representing that no locks are held (@hide).
Bug:
28669096
Change-Id: I774d5ff226e7c639812f9735555c8ea1ed6444af
Test: compiles and runtest frameworks-wifi
mukesh agrawal [Wed, 22 Jun 2016 22:26:10 +0000 (15:26 -0700)]
wifi: allow config of default+verbose ring buffers
Add the ability to set the size of ring buffers for
both logging modes (default and verbose).
BUG=
29225988
TEST=manual
Manual test: add some logging statements to WifiLogger,
verify that the default ring buffer size is 32KB,
and that the verbose ring buffer size is 1024KB.
Change-Id: I4b7bc0da41ba66d15f8e2b6f3c3d6d615691d507
(cherry picked from commit
6ae111026c558daceb0c879368ca2fb385079769)
Lajos Molnar [Tue, 28 Jun 2016 22:32:01 +0000 (22:32 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am:
1fe8871f04
Change-Id: I5f95ce25ee8099c556f04245291da8345df42584
Lajos Molnar [Tue, 28 Jun 2016 22:27:52 +0000 (22:27 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:26:44 +0000 (22:26 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb
Lajos Molnar [Tue, 28 Jun 2016 22:26:42 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I248fbd3da8dd0376d724ca8aee7f8e71bfb260b0
Lajos Molnar [Tue, 28 Jun 2016 22:21:01 +0000 (22:21 +0000)]
Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:19:29 +0000 (22:19 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev
Suprabh Shukla [Mon, 27 Jun 2016 22:12:33 +0000 (15:12 -0700)]
Enabling auto-ota in retail demo mode
Bug:
29542384
Change-Id: If7c94cf8a8e5851011f23dc5d64fc795f9a07b22
Oren Blasberg [Tue, 28 Jun 2016 21:20:02 +0000 (21:20 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a
Oren Blasberg [Tue, 28 Jun 2016 21:12:26 +0000 (21:12 +0000)]
Merge "Fix popup context menu appearing brokenly." into nyc-dev
Android Build Merger (Role) [Tue, 28 Jun 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am:
c1374208e3" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
TreeHugger Robot [Tue, 28 Jun 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Show notification while PRE_BOOT receivers run." into nyc-mr1-dev
Oren Blasberg [Tue, 28 Jun 2016 18:07:42 +0000 (11:07 -0700)]
Fix popup context menu appearing brokenly.
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.
Bug:
29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
Alan Viverette [Tue, 31 May 2016 18:00:45 +0000 (14:00 -0400)]
Remove framework dependencies on Support* demos
Required on nyc-mr1-dev since support library branch was reset.
Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
(cherry picked from commit
80bf1f8a3c6a656a687bb6169a93325cccbb0d06)
Felipe Leme [Tue, 28 Jun 2016 19:22:23 +0000 (19:22 +0000)]
Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am:
8d78c33c9b
Change-Id: I0339e6ae9261b1ebdd7bbed54540ca253b1b6fd9
Todd Kennedy [Tue, 28 Jun 2016 19:16:40 +0000 (19:16 +0000)]
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am:
a98e3e3ede
Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
TreeHugger Robot [Tue, 28 Jun 2016 19:15:33 +0000 (19:15 +0000)]
Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev
Todd Kennedy [Tue, 28 Jun 2016 19:14:11 +0000 (12:14 -0700)]
Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.
Bug:
29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
TreeHugger Robot [Tue, 28 Jun 2016 19:12:48 +0000 (19:12 +0000)]
Merge "Default minSdkVersion to '1'" into nyc-dev
TreeHugger Robot [Tue, 28 Jun 2016 18:54:23 +0000 (18:54 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-mr1-dev
Jeff Sharkey [Tue, 28 Jun 2016 18:33:12 +0000 (12:33 -0600)]
Show notification while PRE_BOOT receivers run.
Awhile back, we switched to running PRE_BOOT receivers after the user
is unlocked. Since these receivers include providers like Contacts
and MediaStore that can take a long time to upgrade, it may result in
apps like Dialer or Photos appearing to hang, so we need to help the
user understand that the system is still upgrading in the background.
Bug:
28164677
Change-Id: I18448534b6067f8508b1ffb2d43c106c02c265a0
Felipe Leme [Tue, 28 Jun 2016 18:29:54 +0000 (11:29 -0700)]
Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.
BUG:
29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
TreeHugger Robot [Tue, 28 Jun 2016 18:24:22 +0000 (18:24 +0000)]
Merge "Clip GradientDrawable's saveLayer" into nyc-mr1-dev
Philip P. Moltmann [Tue, 28 Jun 2016 18:15:37 +0000 (18:15 +0000)]
Merge "Always reload print services" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 17:38:59 +0000 (10:38 -0700)]
Fixed whitelistManager set on unbindServiceLocked()
It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.
Fixes:
29480440
Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35
Lajos Molnar [Fri, 24 Jun 2016 01:07:58 +0000 (18:07 -0700)]
media: document rotation and scaling issues for MediaCodec
Bug:
23709311
Bug:
28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
Chris Craik [Tue, 28 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge "Fix savelayer rounding" into nyc-mr1-dev
Todd Kennedy [Tue, 28 Jun 2016 17:31:05 +0000 (10:31 -0700)]
Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.
Bug:
29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
Allen Hair [Tue, 28 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am:
15783f0073
Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
Allen Hair [Tue, 28 Jun 2016 17:23:54 +0000 (17:23 +0000)]
Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev
Lajos Molnar [Thu, 23 Jun 2016 23:52:29 +0000 (16:52 -0700)]
media: document format keys for MediaExtractor/CodecCapabilities
Bug:
29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
Chris Craik [Mon, 27 Jun 2016 23:30:27 +0000 (16:30 -0700)]
Fix savelayer rounding
bug:
29456451
Change-Id: I8022163d2c004510da5db74efdca27582484224d
Chris Craik [Tue, 28 Jun 2016 16:33:04 +0000 (09:33 -0700)]
Clip GradientDrawable's saveLayer
bug:
29456451
Avoid using very expensive unclipped saveLayer codepath.
Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
Daniel Yu [Tue, 28 Jun 2016 16:28:24 +0000 (16:28 +0000)]
Merge \"resolve merge conflicts of
ac5b340 to nyc-dev\" into nyc-dev
am:
6ec78a6458
Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a
Dan Yu [Tue, 28 Jun 2016 16:21:56 +0000 (16:21 +0000)]
Merge "resolve merge conflicts of
ac5b340 to nyc-dev" into nyc-dev
Philip P. Moltmann [Tue, 28 Jun 2016 16:14:30 +0000 (16:14 +0000)]
Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 15:56:41 +0000 (15:56 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev
Shreyas Basarge [Tue, 28 Jun 2016 15:43:00 +0000 (15:43 +0000)]
Merge \"SyncOperation float cast fix\" into nyc-dev
am:
5f72b129c4
Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4
Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]
Merge "SyncOperation float cast fix" into nyc-dev
Lajos Molnar [Fri, 24 Jun 2016 00:52:48 +0000 (17:52 -0700)]
media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC.
Bug:
10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
Dan Sandler [Tue, 28 Jun 2016 07:07:24 +0000 (07:07 +0000)]
Purr.
am:
610f6ede25
Change-Id: I252d53781fbe151b21909617ecb92ab9f2e9187a