OSDN Git Service
Lajos Molnar [Thu, 3 Mar 2016 21:22:38 +0000 (21:22 +0000)]
Merge "media: rework DescribeColorAspectsParams" into nyc-dev
Andreas Gampe [Thu, 3 Mar 2016 18:56:14 +0000 (18:56 +0000)]
Merge "Installd: Add move_ab command" into nyc-dev
Andreas Gampe [Tue, 1 Mar 2016 19:46:45 +0000 (11:46 -0800)]
Installd: Add move_ab command
Add a command to move A/B artifacts into the right position. This
is used for apps that live in data.
Bug:
25612095
Change-Id: I40c3ca54bd0f3b2d646a14b145e733096dabbbb2
Josh Gao [Tue, 1 Mar 2016 00:20:34 +0000 (16:20 -0800)]
dumpsys: use a socket for dumping, add timeout support.
Passing the stdout file descriptor directly to a service to dump with
leads to bad things happening if the service hangs, or dumpsys is
terminated prematurely. For example, `dumpsys foo | cat` will not
terminate, even if the dumpsys process is killed, since the write end of
the pipe is still alive in the hung service.
Pass an intermediate socketpair when dumping services to avoid this.
Bug: http://b/
26849443
Change-Id: Ide18741080355b3c680275a59172c61734eca92d
Eino-Ville Talvala [Wed, 2 Mar 2016 21:47:08 +0000 (21:47 +0000)]
Merge "GUI: Move Surface.aidl here and implement for native" into nyc-dev
Chong Zhang [Wed, 2 Mar 2016 20:09:58 +0000 (20:09 +0000)]
Merge "Add SurfaceControl::disconnect() to disconnect currently connected API" into nyc-dev
Calin Juravle [Wed, 2 Mar 2016 16:17:24 +0000 (16:17 +0000)]
Merge "Clean up error logs for profiles which don't exists." into nyc-dev
Pablo Ceballos [Wed, 2 Mar 2016 14:16:35 +0000 (14:16 +0000)]
Merge "Revert "Revert "Partial revert of "Fix Surface slot caching"""" into nyc-dev
Pablo Ceballos [Wed, 2 Mar 2016 01:38:10 +0000 (01:38 +0000)]
Revert "Revert "Partial revert of "Fix Surface slot caching"""
This reverts commit
16c9c304a33af36faa352d32777bc48c50bf7b74.
Change-Id: Icbdcba8a646ac40c0533c1c04f5b15769332976c
Eino-Ville Talvala [Wed, 6 Jan 2016 20:09:11 +0000 (12:09 -0800)]
GUI: Move Surface.aidl here and implement for native
- Move android/view/Surface.aidl parcelable definition from frameworks/base
- Implement matching native behavior to android.view.Surface parceling,
to enable use of android.view.Surface in generated native AIDL interfaces
Bug:
25091611
Change-Id: I87ffbb9a19c27a99ce0749d0ca1f17aaa6b3fe74
Calin Juravle [Tue, 1 Mar 2016 17:59:18 +0000 (17:59 +0000)]
Merge "Return an error if try to profile guide compile to a public oat file" into nyc-dev
Ronghua Wu [Tue, 1 Mar 2016 17:36:24 +0000 (17:36 +0000)]
Merge "media: define OMX_VIDEO_HEVCProfileMain10HDR10" into nyc-dev
Calin Juravle [Tue, 23 Feb 2016 19:06:45 +0000 (19:06 +0000)]
Return an error if try to profile guide compile to a public oat file
This makes sure that the oat file access is private to the app when
using profiles.
Bug:
27334750
Bug:
26080105
Change-Id: I9f5deec1a1068d0276928117134956eb233ce504
Andreas Gampe [Tue, 1 Mar 2016 05:42:47 +0000 (05:42 +0000)]
Merge "Otapreopt: Fix patchoat delta parameter" into nyc-dev
Dan Stoza [Tue, 1 Mar 2016 04:49:09 +0000 (04:49 +0000)]
Merge changes I4589e02a,Id300e8b2 into nyc-dev
* changes:
Switch SurfaceFlinger to HWC 2.0
HWC2On1Adapter: Initialize variables and fix mutex
Lajos Molnar [Tue, 1 Mar 2016 04:13:36 +0000 (20:13 -0800)]
media: rework DescribeColorAspectsParams
Separate out ColorAspects into its own structure so it does not
include OMX-specific fields.
Bug:
25975353
Change-Id: I55281d129fce7db81c09bf0d0bc2b13762d7000d
Andreas Gampe [Tue, 1 Mar 2016 02:04:17 +0000 (18:04 -0800)]
Otapreopt: Fix patchoat delta parameter
Only give the delta, not the new base address.
Bug:
25612095
Change-Id: Ieeed5000da5e72477764fc92fe8fa016287d4cd8
Aurimas Liutikas [Tue, 1 Mar 2016 01:40:37 +0000 (01:40 +0000)]
Merge "Fix warnings in frameworks/native/opengl/tests" into nyc-dev
Chong Zhang [Tue, 1 Mar 2016 00:47:47 +0000 (16:47 -0800)]
Add SurfaceControl::disconnect() to disconnect currently connected API
bug:
27295820
Change-Id: I6f51338bc15e018ed7899172653599ab6254c8c9
Lajos Molnar [Tue, 1 Mar 2016 00:40:28 +0000 (00:40 +0000)]
Merge "HardwareAPI: set enum basetypes for MediaImage2" into nyc-dev
Pablo Ceballos [Mon, 29 Feb 2016 22:59:23 +0000 (22:59 +0000)]
Merge "Revert "Partial revert of "Fix Surface slot caching""" into nyc-dev
Pablo Ceballos [Mon, 29 Feb 2016 22:58:54 +0000 (22:58 +0000)]
Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev
Calin Juravle [Mon, 29 Feb 2016 16:41:52 +0000 (16:41 +0000)]
Clean up error logs for profiles which don't exists.
Bug:
27401160
Change-Id: I60f23477e90052c00fb1c1cc5abe827f4270cd07
Dan Stoza [Mon, 2 Nov 2015 21:00:03 +0000 (13:00 -0800)]
Switch SurfaceFlinger to HWC 2.0
Enables SurfaceFlinger to speak to version 2.0 of the Hardware Composer
HAL instead of version 1.x (also removing support for the framebuffer
HAL). By default, however, this functionality is disabled. In order to
enable it, USE_HWC2 must be set to true in Android.mk.
Change-Id: I4589e02ac2165236b10ff2f7cb772f87e0d3daab
Dan Stoza [Tue, 23 Feb 2016 19:43:19 +0000 (11:43 -0800)]
HWC2On1Adapter: Initialize variables and fix mutex
Initializes a few variables that had been missed before, and switches
the Adapter state mutex to be recursive, since it is held during the
call into HWC1 prepare, which can call back into the Adapter to perform
an invalidate.
Change-Id: Id300e8b23403f5339562fd860c2ce9d0f2b72f27
Jesse Hall [Mon, 29 Feb 2016 04:58:50 +0000 (20:58 -0800)]
libvulkan: Check for negative in signed -> unsigned conversion
Requested during security audit in bug
27118888.
Change-Id: Id82382258d2b6f8523b8af29f494dfc67100d190
Jesse Hall [Mon, 29 Feb 2016 04:48:56 +0000 (20:48 -0800)]
libvulkan: Enable integer sanitization
This causes the compiler to add runtime checks for undefined (e.g.
shift by larger than bitwidth) or suspicious (e.g. unsigned integer
overflow) operations. The process will abort if they occur.
In particular, we do many allocations of the form pfnAllocation(n *
sizeof(T)); if 'n' is large these will overflow and we'll allocate
less memory than expected, possibly leading to exploitable buffer
overruns.
Requested during security audit in bug
27118888.
Change-Id: Id81c94595579df034b948a40270f164e38635070
Felipe Leme [Fri, 26 Feb 2016 23:40:30 +0000 (23:40 +0000)]
Merge "Rename .zip file if necessary." into nyc-dev
Felipe Leme [Fri, 26 Feb 2016 23:03:52 +0000 (15:03 -0800)]
Rename .zip file if necessary.
Users have the option to rename the suffix of the files generated by
dumpstate by letting Shell set the dumpstate.PID.name property.
This works fine for text files and used to work for zip files as well,
but now the zip file is opened earlier in the process, so it has to be
renamed at the end.
BUG:
27384407
Change-Id: I288d8eb4a3ffe0161b86cdce14f63e9bfdf865ab
Ronghua Wu [Thu, 25 Feb 2016 00:28:13 +0000 (16:28 -0800)]
media: define OMX_VIDEO_HEVCProfileMain10HDR10
Bug:
25684127
Change-Id: I7e51470b79914eed772f561484e441925f8df1d3
Svetoslav Ganov [Fri, 26 Feb 2016 20:29:58 +0000 (20:29 +0000)]
Merge "Refresh the native app ops manager's token if needed." into nyc-dev
Svet Ganov [Fri, 26 Feb 2016 20:13:04 +0000 (12:13 -0800)]
Refresh the native app ops manager's token if needed.
The app ops manager serivce keeps track of started app ops
by a process by stashing them in a binder object that is
passed to the remote process to hold on to. Hence, the data
is in the system process and is referenced by the client
process it tracks to prevent garbage collaction and limit
risk of resource leaks. It is possible that the client
process is longer lived than the system seriver, e.g. camera
server starts an app op, the system server dies for some
reason, the camera server's app ops manager ends up with
a stale token. The solution is to check the validity of the
token and refresh it if needed.
bug:
27344593
Change-Id: I0abb39e777b7b66b1b5cefede7e7b41c4404c4b1
Jesse Hall [Fri, 26 Feb 2016 00:19:08 +0000 (00:19 +0000)]
Merge "Add Vulkan feature definitions" into nyc-dev
Jesse Hall [Thu, 25 Feb 2016 11:23:13 +0000 (03:23 -0800)]
Add Vulkan feature definitions
Bug:
26583896
Change-Id: I4d1e8b017f478fd79a5075057aeaccbeb1086a2a
Felipe Leme [Thu, 25 Feb 2016 22:02:44 +0000 (14:02 -0800)]
Moved final vibration to the end of the process.
BUG:
26347468
Change-Id: I872d9175fd09b47da512cb2da11a533a921d9a5c
Pablo Ceballos [Thu, 25 Feb 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Add glReadPixels with buffer-offset argument" into nyc-dev
Pablo Ceballos [Thu, 25 Feb 2016 18:52:06 +0000 (18:52 +0000)]
Merge "SF: check secure layers in screenshot message handler" into nyc-dev
Pablo Ceballos [Tue, 23 Feb 2016 19:18:51 +0000 (11:18 -0800)]
SF: check secure layers in screenshot message handler
- Instead of checking for the presence of secure layers on the Binder
thread, check in the message handler. Transactions may have occurred
in between when the check is done and when the screen shot message
is handled.
Bug
23757877
Change-Id: Iec74193996ca72c60f86f7c0f0b2a5dea8d19543
Jesse Hall [Thu, 25 Feb 2016 12:19:32 +0000 (04:19 -0800)]
vulkan: Update to vulkan.h 1.0.3
Change-Id: Ic607533768989aa65e41b9b0e459d7af170ab180
Jesse Hall [Thu, 25 Feb 2016 00:44:42 +0000 (16:44 -0800)]
vkinfo: Provide VkApplicationInfo
This is supposed to be optional, but the N6P/N5X driver currently
requires it.
Change-Id: Ib90962a595052cd829b4967dce4b5a6740173a96
Jesse Hall [Thu, 25 Feb 2016 08:59:06 +0000 (08:59 +0000)]
Merge changes I385a363d,I99129b49 into nyc-dev
* changes:
libvulkan: Set window transform based on swapchain preTransform
libvulkan: Report current and supported transforms accurately
Lajos Molnar [Thu, 25 Feb 2016 02:01:10 +0000 (18:01 -0800)]
HardwareAPI: set enum basetypes for MediaImage2
- also add some internal methods for cleaner usage of these
types
Bug:
25684127
Change-Id: I151270b015ba5989212926e946e04edb7ee8494d
Jesse Hall [Wed, 24 Feb 2016 23:39:50 +0000 (15:39 -0800)]
libvulkan: Set window transform based on swapchain preTransform
Bug:
26927663
Change-Id: I385a363dccbeae2329d25712d30dc629fdce2074
Jesse Hall [Wed, 24 Feb 2016 00:43:29 +0000 (16:43 -0800)]
libvulkan: Report current and supported transforms accurately
Bug:
26927663
Change-Id: I99129b49e2be6f6dd501813185edc67f10b976bf
Felipe Leme [Wed, 24 Feb 2016 22:21:40 +0000 (22:21 +0000)]
Merge "Improved dumpstate logging." into nyc-dev
Aurimas Liutikas [Wed, 24 Feb 2016 01:10:37 +0000 (17:10 -0800)]
Fix warnings in frameworks/native/opengl/tests
Bug:
27152043
Change-Id: I66815e6c6d5f30a73db761e801126ca1262ed883
Bo Hu [Tue, 23 Feb 2016 21:46:31 +0000 (21:46 +0000)]
Merge "emulator: load vendor specific egl libraries first" into nyc-dev
bohu [Sat, 20 Feb 2016 01:15:20 +0000 (17:15 -0800)]
emulator: load vendor specific egl libraries first
Unless emulator specifically asks for gpu emulation on the host
(with ro.kernel.qemu.gles set to 1), always try to load vendor
supplied egl libraries on the guest and fall back to software
renderer.
qemu.gles will be setup correctly to reflect what gles is actually
used.
Change-Id: Ibaf2209dd1e40fa9f18ff4df27bb137d7ad53007
Dan Stoza [Tue, 23 Feb 2016 19:47:56 +0000 (19:47 +0000)]
Merge changes I8cc3ce7d,Ie1a7bfd2,Id472ed4e into nyc-dev
* changes:
libgui: Allow for pending releases in GLConsumer
SF: HWC2 C++ shim
SF: HWC2On1Adapter
Felipe Leme [Tue, 23 Feb 2016 17:54:30 +0000 (17:54 +0000)]
Merge "Send max duration when bugreport is finished so Shell can update metrics." into nyc-dev
Felipe Leme [Tue, 23 Feb 2016 02:12:11 +0000 (18:12 -0800)]
Send max duration when bugreport is finished so Shell can update
metrics.
BUG:
26759986
Change-Id: If599bfb2558c523e64fd6f176eeb494d3e116928
Pablo Ceballos [Tue, 23 Feb 2016 01:44:12 +0000 (01:44 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours am:
62649e9134 am:
a3def43d3c am:
80bf31c686
am:
18737dc9aa -s ours
* commit '
18737dc9aab0f84db50c81f2f245f500f98767dd':
DO NOT MERGE Add SN logging
Dan Stoza [Wed, 18 Nov 2015 01:00:45 +0000 (17:00 -0800)]
libgui: Allow for pending releases in GLConsumer
Adds the ability for GLConsumer to record a pending release instead of
releasing the buffer immediately. This will be used by SurfaceFlinger
to latch a new buffer without having to immediately release the old
one, since it needs to get a fence from HWC before releasing.
Change-Id: I8cc3ce7d5ff80e2ea4b4d681b028db042352d229
Dan Stoza [Sat, 24 Oct 2015 00:03:17 +0000 (17:03 -0700)]
SF: HWC2 C++ shim
Provides an object-based C++ interface to the HWC 2.0 HAL
Change-Id: Ie1a7bfd2f6faa548bc45da845a4f50f1915b5806
Dan Stoza [Fri, 25 Sep 2015 00:03:36 +0000 (17:03 -0700)]
SF: HWC2On1Adapter
This provides an adapter from HWC 2.0, which SurfaceFlinger will be
converted to speak, to HWC 1.x, which all current implementations
support. It requires at least HWC 1.1.
Change-Id: Id472ed4eef0f816403cdf2d40a56177cc7f65930
Pablo Ceballos [Tue, 23 Feb 2016 01:37:24 +0000 (01:37 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours am:
62649e9134 am:
a3def43d3c
am:
80bf31c686
* commit '
80bf31c686f157e2f0d44545f229b342e62780b7':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:31:05 +0000 (01:31 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours am:
62649e9134
am:
a3def43d3c
* commit '
a3def43d3c98a17468c7cdb33777372746f07b5d':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:22:55 +0000 (01:22 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 01:22:55 +0000 (01:22 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489 am:
ccc5d9a0f7 -s ours
am:
62649e9134
* commit '
62649e91348ea1a2988b04ad4d6a4bff880c5fec':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:14:45 +0000 (01:14 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489
am:
ccc5d9a0f7 -s ours
* commit '
ccc5d9a0f7c2d7e59c9374775ff0d12378d402c6':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:14:38 +0000 (01:14 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 01:08:48 +0000 (01:08 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 01:08:33 +0000 (01:08 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours
am:
828f6f1489
* commit '
828f6f1489f546da0ebccd929dd3b819f9d45efd':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 01:01:52 +0000 (01:01 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:54:18 +0000 (00:54 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:54:18 +0000 (00:54 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours
am:
aaeceb2379 -s ours
* commit '
aaeceb2379957791f7a78b441c23c55535a7ba43':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:47:33 +0000 (00:47 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:40:58 +0000 (00:40 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627
am:
ec7538a254 -s ours
* commit '
ec7538a254f283afc7b046aa8ca2fe908d4e3b0c':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
DO NOT MERGE Add SN logging
am:
24cd2b9627
* commit '
24cd2b96279ac29b936ba09ed708b1bcb922d04c':
DO NOT MERGE Add SN logging
Ruchi Kandoi [Mon, 22 Feb 2016 21:24:05 +0000 (21:24 +0000)]
Merge "dumpstate: Remove deprecated /proc/wakelocks" into nyc-dev
Ruben Brunk [Mon, 22 Feb 2016 21:22:39 +0000 (21:22 +0000)]
Merge "Remove unused native binder impl." into nyc-dev
Ruchi Kandoi [Mon, 22 Feb 2016 21:09:50 +0000 (13:09 -0800)]
dumpstate: Remove deprecated /proc/wakelocks
Bug:
13930710
Change-Id: I64733a6093ca227aaee29fc58288a964b7b6b7f9
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Jesse Hall [Tue, 9 Feb 2016 05:22:23 +0000 (21:22 -0800)]
vkinfo: Only print supported features by default
Printing all features with YES/NO tags is available with -v or
-unsupported_features.
Change-Id: I1ad1a024fa306a6b2a0c57f17913be2639101071
Pablo Ceballos [Mon, 22 Feb 2016 19:47:56 +0000 (11:47 -0800)]
Add glReadPixels with buffer-offset argument
- For reading into PBOs on GLES3, add an overloaded version of
glReadPixels that takes an offset argument.
Bug
18878609
Change-Id: Ide9beca7b241a9f8a016e8ae17082bd0ba21246a
Felipe Leme [Mon, 22 Feb 2016 19:06:49 +0000 (11:06 -0800)]
Improved dumpstate logging.
BUG:
26906985
Change-Id: Id439560504a365961337fddcca4ba6c1ef9f377d
Aurimas Liutikas [Mon, 22 Feb 2016 18:38:25 +0000 (18:38 +0000)]
Merge "Fix compiler warnings in sensorservice." into nyc-dev
Pablo Ceballos [Mon, 22 Feb 2016 18:13:30 +0000 (18:13 +0000)]
Merge "Add a callback thread to ConsumerBase" into nyc-dev
Calin Juravle [Mon, 22 Feb 2016 11:41:59 +0000 (11:41 +0000)]
Merge "Extract profile files in their dedicated folder" into nyc-dev
Chia-I Wu [Mon, 22 Feb 2016 04:48:32 +0000 (04:48 +0000)]
Merge "vulkan/vkinfo: enable layers when -validate is specified" into nyc-dev
Chia-I Wu [Mon, 22 Feb 2016 03:41:27 +0000 (11:41 +0800)]
vulkan/vkinfo: enable layers when -validate is specified
Enable layers when -validate is given, instead of unconditionally. This
is a regression fix since vkinfo fails with
vkCreateInstance failed: VK_ERROR_LAYER_NOT_PRESENT (-6)
since commit
b1e7d59.
Change-Id: I42bfc474239896416e26ebf1b18cc65c9c045610
Pablo Ceballos [Sat, 20 Feb 2016 19:30:43 +0000 (11:30 -0800)]
DO NOT MERGE Add SN logging
Bug
27046057
Change-Id: I942876c09fdbe841c19807e463f5426287e07803
Pablo Ceballos [Sat, 20 Feb 2016 19:26:13 +0000 (11:26 -0800)]
Add SN logging
Bug
27046057
Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
Pablo Ceballos [Sat, 20 Feb 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Add interface for controlling single buffer auto refresh" into nyc-dev
Pablo Ceballos [Sat, 20 Feb 2016 01:41:54 +0000 (17:41 -0800)]
Add a callback thread to ConsumerBase
- Add a message queue and callback thread in ConsumerBase.
- This is used to prevent deadlocks when ConsumerBase calls into
BufferQueueConsumer and that generates a callback.
Bug
27229287
Change-Id: I45c41e5a554555511fcfa5c185a7d60b0d969b7e
Pablo Ceballos [Sat, 20 Feb 2016 00:59:54 +0000 (00:59 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours am:
5fe5b47563 am:
c6e289a359 am:
15c5c3e6ed
am:
ba2d7d4eda -s ours
* commit '
ba2d7d4eda715453341bc2116cfcb6ac25990c8e':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:46:48 +0000 (00:46 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours am:
5fe5b47563 am:
c6e289a359
am:
15c5c3e6ed
* commit '
15c5c3e6ed6dc11bfe3bd7d7a0e4436cc37d5632':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:40:22 +0000 (00:40 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours am:
5fe5b47563
am:
c6e289a359
* commit '
c6e289a359df83b122933688a296a4dde37cb674':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:34:00 +0000 (00:34 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d am:
31b8553cee -s ours
am:
5fe5b47563
* commit '
5fe5b4756383ac1fc858ed00970589a00fb7fe85':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:33:59 +0000 (00:33 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb am:
8b640e6403 am:
5d2c73e7dc am:
724f7954db
am:
82b9819d93
* commit '
82b9819d930c48124812c1a499a91218305a5d14':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:28:14 +0000 (00:28 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb am:
8b640e6403 am:
5d2c73e7dc
am:
724f7954db
* commit '
724f7954dba26a23a36c7832b37ea722987c3491':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:28:10 +0000 (00:28 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours am:
84cd1a325d
am:
31b8553cee -s ours
* commit '
31b8553ceece9a4e3130510b484163e10c4fc588':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:23:04 +0000 (00:23 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb am:
8b640e6403
am:
5d2c73e7dc
* commit '
5d2c73e7dc9d4d23a76ca92c0170233e897fe55c':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:22:58 +0000 (00:22 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours
am:
84cd1a325d
* commit '
84cd1a325d4e1ff1bdec09137b13a7c925b267f8':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:17:09 +0000 (00:17 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114 am:
f419ec1bfb
am:
8b640e6403
* commit '
8b640e6403de9dd328b2605c9f21b62d1d31e7d6':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:11:58 +0000 (00:11 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours
am:
8b6dea4fa8 -s ours
* commit '
8b6dea4fa88e967c221821e03f88b8f42585869e':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:11:58 +0000 (00:11 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114
am:
f419ec1bfb
* commit '
f419ec1bfb969f1add4c90b5b188041968f5f227':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:06:10 +0000 (00:06 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3
am:
7e83de0114
* commit '
7e83de0114538b006b4299fd608983ecd61b6422':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:00:50 +0000 (00:00 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413
am:
1d0e811e5a -s ours
* commit '
1d0e811e5ac853669fe96370e499428049a5b7ee':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:54:34 +0000 (23:54 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
am:
c232606413
* commit '
c2326064136adb834d12c3fed47af5d66cd42c15':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump