OSDN Git Service
Alan Viverette [Wed, 29 Jun 2016 20:43:32 +0000 (20:43 +0000)]
Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am:
471af954c3
Change-Id: I33d7193643b189c9b51e240ad1a834bae3e0fc31
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
Android Build Merger (Role) [Wed, 29 Jun 2016 20:37:34 +0000 (20:37 +0000)]
Merge "Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev am:
c295a4b23d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 29 Jun 2016 20:37:26 +0000 (20:37 +0000)]
Merge "Merge \\"docs: Edits to Instant Apps FAQs, index page.\\" into nyc-dev am:
7a4d857c45 am:
8c8a5e9296" into nyc-mr1-dev-plus-aosp
David Friedman [Wed, 29 Jun 2016 20:37:07 +0000 (20:37 +0000)]
Merge \\"docs: Edits to Instant Apps FAQs, index page.\\" into nyc-dev am:
7a4d857c45
am:
8c8a5e9296
Change-Id: I0cdfbab264070fd168abb34c9e6cbaeb72d026a9
Alan Viverette [Wed, 29 Jun 2016 20:34:47 +0000 (20:34 +0000)]
Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am:
c295a4b23d
Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688
mukesh agrawal [Wed, 29 Jun 2016 20:34:44 +0000 (20:34 +0000)]
Merge \"wifi: allow config of default+verbose ring buffers\" into nyc-mr1-dev
am:
88442c1fe1
Change-Id: Ibd81afe406de02e46664e4cf846e0e2e50968603
Alex Light [Wed, 29 Jun 2016 20:34:39 +0000 (20:34 +0000)]
Merge \"cp preopted files from B partition during PM init.\" into nyc-mr1-dev
am:
7281cf276a
Change-Id: I29c2aaa637f5c0f948dae0f6ea065d2136b57e74
Eric Schmidt [Wed, 29 Jun 2016 20:31:57 +0000 (20:31 +0000)]
Merge \"docs: Edits to Instant Apps FAQs, index page.\" into nyc-dev
am:
7a4d857c45
Change-Id: I8bf1098f3fcd7db37d1ceb74776f1c0a6e98c288
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:23:09 +0000 (20:23 +0000)]
Merge changes from topic \'cherrypickWifiWatchdogResetOnTrigger\' into nyc-mr1-dev
am:
b2f17f1bbb
Change-Id: Ic723498b7b486edd8f63822cb86127486a5c4657
Android Build Merger (Role) [Wed, 29 Jun 2016 20:20:24 +0000 (20:20 +0000)]
Merge "Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f am:
8a17a77e4b" into nyc-mr1-dev-plus-aosp
Sid Soundararajan [Wed, 29 Jun 2016 20:19:59 +0000 (20:19 +0000)]
Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f
am:
8a17a77e4b
Change-Id: I23f27052f72dc043af67924f8babe256e3c8f127
Sid Soundararajan [Wed, 29 Jun 2016 20:18:25 +0000 (20:18 +0000)]
Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f
am:
aea3d63f85
Change-Id: Icf38b12e0caa437f7032f404dadd6f988c981c93
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:54 +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: If4ddf850d2be037d50a7aa3ddbce040c7ad4b7cd
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
Wale Ogunwale [Wed, 29 Jun 2016 19:36:09 +0000 (19:36 +0000)]
Merge \"Have wallpaper target itself when dismissing keyguard with wallpaper\" into nyc-mr1-dev
am:
5329715a74
Change-Id: I73abfacc9104437b73659991d21af3ef620e2211
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
Android Build Merger (Role) [Wed, 29 Jun 2016 17:07:31 +0000 (17:07 +0000)]
Merge "Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57 am:
a75526bd11" into nyc-mr1-dev-plus-aosp
Alan Viverette [Wed, 29 Jun 2016 17:07:06 +0000 (17:07 +0000)]
Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57
am:
a75526bd11
Change-Id: I57c5e8728ba22daa08734b59b2808c21dba14e4d
Alan Viverette [Wed, 29 Jun 2016 17:05:36 +0000 (17:05 +0000)]
Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57
am:
25242a7bbc
Change-Id: I20e41c6ebbac82fd70ae3d724e484eac78d2b308
Alan Viverette [Wed, 29 Jun 2016 17:01:22 +0000 (17:01 +0000)]
Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev
am:
f66bdf9b57
Change-Id: I05799d473194db7e9a1a42871f988e81d41baf61
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
Chong Zhang [Wed, 29 Jun 2016 16:58:15 +0000 (16:58 +0000)]
Merge \"Fix off-by-one in am start -R (repeat)\" into nyc-mr1-dev
am:
a3fc533d77
Change-Id: I1a779203012617991be1669b14d3466badc0cbd0
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 16:07:18 +0000 (16:07 +0000)]
Merge \"Fixed race condition by using a separate counter\" into nyc-mr1-dev
am:
d2e8ae4a90
Change-Id: I8774a4736c29cc8c0433776db40135ceb86ac8f8
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:46:20 +0000 (15:46 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-mr1-dev
am:
488153094c
Change-Id: I63134d80f8ddf6e1b375f37617404ede1aeb03b1
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:24:06 +0000 (15:24 +0000)]
Merge \"An API to check if running in a demo user\" into nyc-mr1-dev
am:
b71081e4e9
Change-Id: Ie4e01ae963a86346acbc81d2ca5824ddefef8d20
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:46:19 +0000 (07:46 +0000)]
Merge \"Use the first Vulkan layer path\" into nyc-mr1-dev
am:
bbadc5d313
Change-Id: I3c71a44f938957762072d8e08d6ce570157185fc
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 [Wed, 29 Jun 2016 07:18:32 +0000 (07:18 +0000)]
Adding tests for DnsEventListenerService
am:
5e055187be
Change-Id: I498ad1303ff3c0fbc4517203ff8e6b931814562b
Hugo Benichi [Wed, 29 Jun 2016 07:18:28 +0000 (07:18 +0000)]
Refactor IP connectivity event logging
am:
cfddd68792
Change-Id: I8de880edc4a8c7f12527218788cb44f263acb56f
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
Android Build Merger (Role) [Wed, 29 Jun 2016 03:40:46 +0000 (03:40 +0000)]
Merge "Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am:
55427a6650 am:
5bf74ae1b9" into nyc-mr1-dev-plus-aosp
Rob Carr [Wed, 29 Jun 2016 03:40:19 +0000 (03:40 +0000)]
Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am:
55427a6650
am:
5bf74ae1b9
Change-Id: I5f09aa883e01593ddf0fad9b5f14201619e652a5
Rob Carr [Wed, 29 Jun 2016 03:40:13 +0000 (03:40 +0000)]
Merge \\"Only use one SurfaceControlWithBackground per AppToken.\\" into nyc-dev am:
55427a6650
am:
518c3a109e
Change-Id: Ibc2098a9d175645448ce99297ca6985a3acccf04
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: I4a516ef8a56a0241a8c257dbaabed048d9cd1de4
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
Android Build Merger (Role) [Wed, 29 Jun 2016 02:26:57 +0000 (02:26 +0000)]
Merge "Move preloading to boot complete. am:
16ef39a7f6 am:
52cfea9c35" into nyc-mr1-dev-plus-aosp
Winson [Wed, 29 Jun 2016 02:26:29 +0000 (02:26 +0000)]
Move preloading to boot complete. am:
16ef39a7f6
am:
52cfea9c35
Change-Id: I08d6ca1d1d26c4792e9973424cb05cf69fcf2871
Winson [Wed, 29 Jun 2016 02:26:28 +0000 (02:26 +0000)]
Move preloading to boot complete. am:
16ef39a7f6
am:
067d73e55b
Change-Id: I03c9bbb8795b6ae43681dfc1787420a1cb997fdd
Winson [Wed, 29 Jun 2016 02:20:47 +0000 (02:20 +0000)]
Move preloading to boot complete.
am:
16ef39a7f6
Change-Id: Ib10db04397d2a962c50530ce537f9ac1b2863a0a
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
Suprabh Shukla [Wed, 29 Jun 2016 01:45:17 +0000 (01:45 +0000)]
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
am:
634ed6bc17
Change-Id: Ief5ce9cfa0ec8d221a221ef726e8b516e35db606
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
Philip P. Moltmann [Wed, 29 Jun 2016 01:33:38 +0000 (01:33 +0000)]
Merge \"Prevent PrintSpooler from being disabled\" into nyc-mr1-dev
am:
2d8c91f238
Change-Id: Id3e78a8e097e000cbfae5be1c4991f16d09a0e0e
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 01:13:42 +0000 (01:13 +0000)]
Merge \"Add a few trace points for animation loading.\" into nyc-mr1-dev
am:
8e3b57aad5
Change-Id: I05cd897ef70f7eef70fd3f361ec7564b6e837302
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
Android Build Merger (Role) [Wed, 29 Jun 2016 00:51:13 +0000 (00:51 +0000)]
Merge "Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9 am:
ef26bf0f0a" into nyc-mr1-dev-plus-aosp
Jim Miller [Wed, 29 Jun 2016 00:50:30 +0000 (00:50 +0000)]
Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9
am:
3ff70b6370
Change-Id: I36ae63ccfe8032752ed97d7e38fd214604195f10
Jim Miller [Wed, 29 Jun 2016 00:50:30 +0000 (00:50 +0000)]
Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9
am:
ef26bf0f0a
Change-Id: I219139fde5c35adb09bd1a3f012e97a3a8dc4313
Jim Miller [Wed, 29 Jun 2016 00:45:09 +0000 (00:45 +0000)]
Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am:
60c04126c9
Change-Id: I367432f84032da91ea5b9a39e8f4cf6a8eb6ea81
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:25:13 +0000 (00:25 +0000)]
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am:
41a3acc55a
Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2
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
Ajay Panicker [Tue, 28 Jun 2016 23:40:15 +0000 (23:40 +0000)]
Protect REFRESH_BATCHED_SCAN broadcast
am:
58dd0cd65e
Change-Id: I3b65f8c81ff6658b593e58ac3897e83146a9d5e0
Philip P. Moltmann [Tue, 28 Jun 2016 21:14:06 +0000 (14:14 -0700)]
Prevent PrintSpooler from being disabled
Change-Id: I40fb7b25174a41d04f767fbf8ee1da8c02e7156a
Fixes:
29830022
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:41:08 +0000 (22:41 +0000)]
Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-dev am:
1fe8871f04
am:
a1df385e74
Change-Id: I3abb37c4a03f2e8280f31da6d928047e9c3b1957
Lajos Molnar [Tue, 28 Jun 2016 22:37:37 +0000 (22:37 +0000)]
Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-dev am:
1fe8871f04
am:
818f7c8c1a
Change-Id: I089bf617d9c86272f7b2c601e372b03846bfa266
Android Build Merger (Role) [Tue, 28 Jun 2016 22:33:23 +0000 (22:33 +0000)]
Merge "Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e am:
eb6fac8029" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 22:33:02 +0000 (22:33 +0000)]
Merge "Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979 am:
ac43565741" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Tue, 28 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am:
1fe8871f04
Change-Id: I20c207b5bc735221eaf8982759d00b7a2a89a983
Lajos Molnar [Tue, 28 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e
am:
eb6fac8029
Change-Id: Id8acd064aa09a84792d2e70448920673e27ddcdc
Lajos Molnar [Tue, 28 Jun 2016 22:32:03 +0000 (22:32 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979
am:
ac43565741
Change-Id: Iaab9c87c6f34bdb4677524cd8ccf9e0b00803c66
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:31:55 +0000 (22:31 +0000)]
Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e
am:
2d9139410f
Change-Id: I7f46ee8cf0cc5c16b235186c30bb72db8005fa6a
Lajos Molnar [Tue, 28 Jun 2016 22:31:52 +0000 (22:31 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979
am:
29522123db
Change-Id: I7e062dcc471284c84fe8d186babece0dfb34a0bb
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:27:05 +0000 (22:27 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
Lajos Molnar [Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
OSDN Git Service
