OSDN Git Service
Steven Thomas [Wed, 8 Feb 2017 02:07:01 +0000 (18:07 -0800)]
Fix vr flinger deadlock and race condition
While investigating hangs when transitioning from 2d --> vr and back I
found a deadlock and race condition in the vr flinger pause/resume
handling. This CL should fix both issues.
Unfortunately there's still another deadlock related to multiple threads
trying to suspend/resume vr flinger, but considering how vr flinger is
currently used by surface flinger we shouldn't ever hit that scenario in
practice.
Bug: None
Test: I was able to reliably get a hang when starting/stopping vr
launcher a few times, but with this CL applied and another CL to remove
calls to SetPowerMode() applied (that CL will be submitted separately),
I no longer see any hangs.
Change-Id: Ie842bf9fb00e4e2937769ed7e1e2ec9cc47861f7
(cherry picked from commit
cf921a3919d68d8c8d1b8be39e03a372f6346f57)
TreeHugger Robot [Wed, 8 Feb 2017 19:12:27 +0000 (19:12 +0000)]
Merge "Integrate binder service to vr window manager for controller input."
TreeHugger Robot [Wed, 8 Feb 2017 19:07:06 +0000 (19:07 +0000)]
Merge "Discard invisible surfaces"
TreeHugger Robot [Wed, 8 Feb 2017 18:13:53 +0000 (18:13 +0000)]
Merge "fix warning: dereference of a null pointer"
Leandro Gracia Gil [Tue, 7 Feb 2017 00:04:21 +0000 (16:04 -0800)]
Update the GVR platform library.
This CL renames the target for the GVR platform library and introduces
a new method in it to determine if this is an all-in-one device or a
Daydream-ready smartphone.
Bug:
34713987
Change-Id: I38067cb02fd805f3fbe1925250bddebfe82cce55
(cherry picked from commit
904762bdddd2ea5d386b1cf5fb7a35899fbc7a1e)
TreeHugger Robot [Wed, 8 Feb 2017 09:11:10 +0000 (09:11 +0000)]
Merge "batteryservice: expose battery status"
TreeHugger Robot [Wed, 8 Feb 2017 09:08:02 +0000 (09:08 +0000)]
Merge "Use 'cmd activity' instead 'am' to send a broadcast."
Craig Donner [Wed, 8 Feb 2017 01:47:01 +0000 (01:47 +0000)]
Merge "Adds support for more gralloc1 functions to GrallocMapper."
Craig Donner [Wed, 8 Feb 2017 01:42:31 +0000 (01:42 +0000)]
Merge "Add methods for allocating and locking GraphicBuffers via gralloc1 flags"
Hendrik Wagenaar [Tue, 7 Feb 2017 22:27:28 +0000 (14:27 -0800)]
Discard invisible surfaces
* Jiwen found that we would try to post invisible layers, and this
would cause a hang.
* Check to see if the surface is invisible, and if so, discard it
Test: Manually tested with particles
Change-Id: Id4a0813cb30bd48c3cfa4d13dcee59fcb5f58a8d
Alex Sakhartchouk [Sun, 29 Jan 2017 22:04:17 +0000 (17:04 -0500)]
Integrate binder service to vr window manager for controller input.
Bug:
34806399
Test: None
Change-Id: I4fadd3522082f27b053038fe65b61b1126a5a5f2
(cherry picked from commit
3bbfb1b46661439e618c13d9e0dac583edeb16fc)
Fabien Sanglard [Tue, 7 Feb 2017 22:03:15 +0000 (22:03 +0000)]
Merge "Revert "Enable TripleBuffering on SF by default""
Fabien Sanglard [Tue, 7 Feb 2017 22:02:22 +0000 (22:02 +0000)]
Revert "Enable TripleBuffering on SF by default"
This reverts commit
f222b2e6f4a3c26d6d2d9e3dd9056e5c95d7bc9c.
Change-Id: I300e46c9e93840fde85471eed4e5f7d10dde9b43
Jin Qian [Fri, 3 Feb 2017 01:33:36 +0000 (17:33 -0800)]
batteryservice: expose battery status
Bug:
34198239
Change-Id: Iccd2d88efe4cfbfeb753dee866ded099cf445548
Felipe Leme [Tue, 7 Feb 2017 17:19:01 +0000 (09:19 -0800)]
Use 'cmd activity' instead 'am' to send a broadcast.
'am' is a deprecated binary that calls the ActivityManager shell
command behind the scenes, so calling 'cmd activity' directly
eliminates a process fork.
Bug:
34833915
Test: manual verification
Change-Id: Ia156897d784aa1d64f60317f92828987d64936e3
TreeHugger Robot [Tue, 7 Feb 2017 15:16:35 +0000 (15:16 +0000)]
Merge "VR: Fail presentation without layers"
TreeHugger Robot [Tue, 7 Feb 2017 10:13:06 +0000 (10:13 +0000)]
Merge "ProcessInfoService: Add support for oom score query"
wyau [Tue, 7 Feb 2017 06:16:38 +0000 (06:16 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am:
6560727f37 am:
adde06b9e8 am:
1f94c41f83
am:
d7a4a56b37
Change-Id: I6be4ced0d5779f319976f8f24fc446c3473d0428
wyau [Tue, 7 Feb 2017 04:34:25 +0000 (04:34 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am:
6560727f37 am:
adde06b9e8
am:
1f94c41f83
Change-Id: I4a1819a3aa9f4c5aa7233225bdae29435272cade
wyau [Tue, 7 Feb 2017 04:16:12 +0000 (04:16 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am:
6560727f37
am:
adde06b9e8
Change-Id: I68e33ab1173bbae30e8d22ae86397ec081051f7f
wyau [Tue, 7 Feb 2017 04:13:40 +0000 (04:13 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband"
am:
6560727f37
Change-Id: Idfeaf9f6e29eda948b44a1110ae18a5099a0977e
wyau [Tue, 7 Feb 2017 04:07:15 +0000 (04:07 +0000)]
Merge "SurfaceFlinger supports ClearClientTarget for Sideband"
Daniel Nicoara [Mon, 6 Feb 2017 18:21:15 +0000 (13:21 -0500)]
VR: Fail presentation without layers
Without any layers or a valid client target there is nothing to present.
Bug: None
Test: Compiled
Change-Id: Ib8b4b7ced628a38c69be726bf1c04dde2882c614
(cherry picked from commit
12da96889be17f1964681210d0f780fd70fefc33)
TreeHugger Robot [Mon, 6 Feb 2017 22:39:39 +0000 (22:39 +0000)]
Merge "Enable TripleBuffering on SF by default"
Gray Huang [Wed, 11 Jan 2017 05:41:09 +0000 (13:41 +0800)]
SurfaceFlinger supports ClearClientTarget for Sideband
When clearing the layer's intersection with the dirty region,
HWC2::Composition::Sideband layer needs to be cleared as well.
Bug:
33443134
Test: manual - enter PIP mode with Live Channel
Change-Id: I4fecc7b5db8a2bf220b681bd087264290d1a2443
TreeHugger Robot [Mon, 6 Feb 2017 21:13:30 +0000 (21:13 +0000)]
Merge "Report binder versions on failure"
Fabien Sanglard [Mon, 6 Feb 2017 20:21:21 +0000 (12:21 -0800)]
Enable TripleBuffering on SF by default
Change-Id: I5958534133799419fa77c00536c68cacd1ccb6a9
TreeHugger Robot [Mon, 6 Feb 2017 19:52:13 +0000 (19:52 +0000)]
Merge "Nullptr check for VSyncClient::Wait"
Greg Hartman [Wed, 4 Jan 2017 00:54:59 +0000 (16:54 -0800)]
Report binder versions on failure
BUG:
34053032
Test: foo
Change-Id: Ida43d037cc6cf70cd5f0e9f678db70d624c99285
TreeHugger Robot [Mon, 6 Feb 2017 18:56:37 +0000 (18:56 +0000)]
Merge "Add param null-check + error return"
Jesse Hall [Mon, 6 Feb 2017 18:40:59 +0000 (18:40 +0000)]
Merge "Add android.hardware.vulkan.compute=0 feature file"
Okan Arikan [Fri, 3 Feb 2017 23:06:35 +0000 (15:06 -0800)]
Nullptr check for VSyncClient::Wait
as the documentation in the header implies
Bug:
34609900
Test: pass nullptr to Wait and observe your code not crashing
Change-Id: Ia3ead8cf3369bddedfca4606d0fa261fd57c281f
(cherry picked from commit
a919630f3c7cd3c2ee90ef39cbf8147681dd9be8)
Emilian Peev [Thu, 2 Feb 2017 09:57:18 +0000 (09:57 +0000)]
ProcessInfoService: Add support for oom score query
An additional query for the process oom score also
needs to be supported.
BUG:
34701266
Test: Manual testing + run cts -m Camera --abi armeabi-v7a --disable-reboot
Change-Id: I3e7de82c4d14d4b3b7faa86f4c7208deb376b6c4
Hendrik Wagenaar [Mon, 6 Feb 2017 16:48:24 +0000 (08:48 -0800)]
Add param null-check + error return
* Fail gracefully when no hidl is passed
Test: Manually ran with nullptr
Change-Id: I2726c5ad512c7115f4c6e99d1e41e0fe267e6ff2
Jesse Hall [Mon, 6 Feb 2017 08:09:59 +0000 (00:09 -0800)]
Add android.hardware.vulkan.compute=0 feature file
Bug:
34745152
Test: android.graphics.cts.VulkanFeaturesTest
Change-Id: Ic16e745e255b5b1b58c80586c5becf7bc358a46d
Jean-Michel Trivi [Sat, 4 Feb 2017 22:47:49 +0000 (22:47 +0000)]
Merge "IPlayer interface: resync with Java interface definition"
TreeHugger Robot [Sat, 4 Feb 2017 02:38:13 +0000 (02:38 +0000)]
Merge "atrace: Make atrace notify VR services of new trace sessions"
TreeHugger Robot [Sat, 4 Feb 2017 02:08:49 +0000 (02:08 +0000)]
Merge changes I712083df,I800e6050
* changes:
Fixup 2D app patch, forgot to remove unused variable
Call releaseFrame on the IVrComposerView interface
TreeHugger Robot [Sat, 4 Feb 2017 02:06:22 +0000 (02:06 +0000)]
Merge "Scale up the display and rotate by 90 degrees"
TreeHugger Robot [Sat, 4 Feb 2017 02:02:11 +0000 (02:02 +0000)]
Merge changes Iea842087,I4830d121,Ied48f024
* changes:
Allow VRWM to show 2D apps
VR: Do extra validation in VR HWC
Start VR WindowManager in a headless mode.
TreeHugger Robot [Sat, 4 Feb 2017 01:52:03 +0000 (01:52 +0000)]
Merge changes I41ed91a1,Ic6de9a1b
* changes:
Move surface_flinger_view creation into init code.
Remove access to the backlight brightness
TreeHugger Robot [Sat, 4 Feb 2017 01:51:27 +0000 (01:51 +0000)]
Merge changes I23836041,Ic0c9754d,Iae781f49
* changes:
Update GVR prebuilts to CL@
146314416
Add 6dof to the list of supported gvr features
Fix an incorrect LOG_ALWAYS_FATAL_IF introduced in sweep
TreeHugger Robot [Sat, 4 Feb 2017 00:27:36 +0000 (00:27 +0000)]
Merge "Fix protected content playback via HWC2on1Adapter"
Corey Tabaka [Sat, 14 Jan 2017 07:46:55 +0000 (23:46 -0800)]
atrace: Make atrace notify VR services of new trace sessions
Notify VR services based on PDX IPC of system property changes to let
them know a new trace session starts.
Bug: None
Test: Build and flash system; observe that systrace works for PDX services.
Change-Id: I02c6a08dd77760684f84154df4d07a853869481a
Albert Chaulk [Fri, 3 Feb 2017 22:00:39 +0000 (17:00 -0500)]
Fixup 2D app patch, forgot to remove unused variable
Bug: None
Test: permissiongen to check non-2d app uage
Change-Id: I712083dfe417eb5549b78dc7ab1ee37faa042338
Albert Chaulk [Fri, 3 Feb 2017 18:01:59 +0000 (13:01 -0500)]
Scale up the display and rotate by 90 degrees
Test: Launch calculator app
Bug: None
Change-Id: Iac2b6b682a94449ba76e689c11357f2247c8e63a
Albert Chaulk [Fri, 3 Feb 2017 18:43:50 +0000 (13:43 -0500)]
Call releaseFrame on the IVrComposerView interface
Bug: None
Test: None
Change-Id: I800e6050efc4d5aa4fe79fc62464c9f221a5dc18
Albert Chaulk [Fri, 3 Feb 2017 17:05:56 +0000 (12:05 -0500)]
Allow VRWM to show 2D apps
2D apps appear as a single app layer at the front of the stack. We can
distinguish them from VR apps as VR has two layers at the front.
When we detect a 2D app we don't skip the first layers for rendering
Test: launch VR app, launch calculator
Bug: None
Change-Id: Iea8420870852b84ab790b5185ac1a44103c2aae5
Daniel Nicoara [Thu, 2 Feb 2017 16:18:02 +0000 (11:18 -0500)]
VR: Do extra validation in VR HWC
Validate that the client target buffer is valid before using it and
validate that the requested layers have valid buffers associated with
them.
Bug: None
Test: Compiled
Change-Id: I4830d121e8ab519a24f954fe21c35199f1c1d900
Alex Sakhartchouk [Wed, 1 Feb 2017 20:41:45 +0000 (15:41 -0500)]
Start VR WindowManager in a headless mode.
Only allocate resources when we need to show ourselves
and draw something.
Bug: None
Test: None
Change-Id: Ied48f024b145ee6f574484883375b939e7814e53
Alex Sakhartchouk [Thu, 2 Feb 2017 22:27:42 +0000 (17:27 -0500)]
Move surface_flinger_view creation into init code.
We use it to receive buffers and trigger visibility.
Bug: None
Test: triggered permission
Change-Id: I41ed91a16fb6bfb27687476fbe43c17fc05bc870
Hendrik Wagenaar [Thu, 2 Feb 2017 18:00:48 +0000 (10:00 -0800)]
Remove access to the backlight brightness
* We don't need to set the display brightness at the moment, and
access to the brightness fd requires an SELinux policy change
that we'd like to avoid, so ifdef out the code for now.
Bug: None
Test: To be tested along with Nick's SELinux policy cl
Change-Id: Ic6de9a1bd15d0eab2780bda31ec67fab94f8d6da
Jiwen 'Steve' Cai [Thu, 2 Feb 2017 02:00:41 +0000 (18:00 -0800)]
Update GVR prebuilts to CL@
146314416
This removes gvr_experimental_is_feature_supported API in shared library
prebuilts.
Bug:
34742071
Test: Build and ran particles.apk
Change-Id: I23836041993133ae055bd7e90cca99c5d2739ce7
Steven Thomas [Thu, 2 Feb 2017 02:02:10 +0000 (18:02 -0800)]
Add 6dof to the list of supported gvr features
While reimplementing gvr_experimental_is_feature_supported() as
gvr_is_feature_supported() I accidentally removed 6dof from the list of
supported features.
Bug:
34742071
Test: -
Change-Id: Ic0c9754d72a704d6bfd74dd7a14bdf6e89ed4dd4
Hendrik Wagenaar [Fri, 3 Feb 2017 04:26:45 +0000 (20:26 -0800)]
Fix an incorrect LOG_ALWAYS_FATAL_IF introduced in sweep
* flip the condition to get same functionality as before the
sweep
Bug: None
Test: None
Change-Id: Iae781f495f29357431d84e79207849f9c3659d94
Fabien Sanglard [Fri, 3 Feb 2017 00:59:44 +0000 (16:59 -0800)]
Fix protected content playback via HWC2on1Adapter
The adapter marked unsupported dataspace layer with HWC_SKIP_LAYER
which prevented HWC to mark protected content with HWC_OVERLAY.
Test: AUPT
Change-Id: Id8c05c7e575ffcc4160cdd8d23b151c4901b4c5c
Craig Donner [Thu, 2 Feb 2017 20:40:05 +0000 (12:40 -0800)]
Adds support for more gralloc1 functions to GrallocMapper.
Bug:
34939453
Test: added native CTS tests checked with
cts-tradefed run cts-dev -m CtsNativeHardwareTestCases
Change-Id: I2393f6ec6c7eff5d229a5aa61ff2a52a9366fd1e
Craig Donner [Thu, 2 Feb 2017 20:13:34 +0000 (12:13 -0800)]
Add methods for allocating and locking GraphicBuffers via gralloc1 flags
Bug:
34050596
Test: manual
Change-Id: I9515e60fe6b67d2c6f02b1bb78651669430f12ef
Ian Elliott [Fri, 3 Feb 2017 20:41:17 +0000 (20:41 +0000)]
Merge "Hook the VK_KHR_incremental_present extension"
Ian Elliott [Fri, 3 Feb 2017 18:24:07 +0000 (11:24 -0700)]
Hook the VK_KHR_incremental_present extension
Test: Ran the CTS tests
Small oversight when first implemented.
Change-Id: I9d4804aea3c986c49d69bc1f56b81127553f7863
Yunlian Jiang [Fri, 3 Feb 2017 02:53:45 +0000 (02:53 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63 am:
f62690cdaf am:
d1f7b9d025
am:
501e019523
Change-Id: I2155e7df5ffd16a967d4465218cf852c9148f884
Yunlian Jiang [Fri, 3 Feb 2017 02:51:14 +0000 (02:51 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63 am:
f62690cdaf
am:
d1f7b9d025
Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d
Yunlian Jiang [Fri, 3 Feb 2017 02:48:46 +0000 (02:48 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63
am:
f62690cdaf
Change-Id: If7255629f0be37af2c08da90e9010423d73decfc
Yunlian Jiang [Fri, 3 Feb 2017 02:46:15 +0000 (02:46 +0000)]
Merge "Fix warning: macro redefined"
am:
909ef30a63
Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
Treehugger Robot [Fri, 3 Feb 2017 02:39:19 +0000 (02:39 +0000)]
Merge "Fix warning: macro redefined"
TreeHugger Robot [Fri, 3 Feb 2017 00:49:43 +0000 (00:49 +0000)]
Merge changes I9f2ea67c,I34588df1,I88a56236
* changes:
Use generic libpdx event bits facility in libvrflinger and bufferhubd.
Add libvrflinger for use in SurfaceFlinger
Export surface flinger includes
TreeHugger Robot [Fri, 3 Feb 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Add binder native side code for BatteryPropertiesListener"
TreeHugger Robot [Fri, 3 Feb 2017 00:29:25 +0000 (00:29 +0000)]
Merge "Build shared library for batteryservice"
TreeHugger Robot [Thu, 2 Feb 2017 23:33:58 +0000 (23:33 +0000)]
Merge "SurfaceFlinger: Set property in separate thread in init"
Corey Tabaka [Thu, 19 Jan 2017 23:07:26 +0000 (15:07 -0800)]
Use generic libpdx event bits facility in libvrflinger and bufferhubd.
Use the generic event bits abstraction to support UDS and ServiceFS
backends properly.
Bug:
34466748
Test: start/stop basicvr repeatedly; observe stable bufferhub counts.
Change-Id: I9f2ea67c25860ad7fb931938991a29a37f3391fc
Alex Vakulenko [Fri, 27 Jan 2017 22:41:57 +0000 (14:41 -0800)]
Add libvrflinger for use in SurfaceFlinger
A separate CL uses this code from SurfaceFlinger.
Bug: None
Test: Manually ran modified SurfaceFlinger
Change-Id: I34588df1365588c0a0265e1e2325e3dd5516206a
Alex Vakulenko [Thu, 2 Feb 2017 06:25:44 +0000 (22:25 -0800)]
Export surface flinger includes
* Before we start using libvrflinger, we need to export the
surface flinger includes.
Bug: None
Test: Compile surfaceflinger and libvrflinger together
Change-Id: I88a56236f297eb58397fcda5ff28bfecbd4e0971
Jin Qian [Thu, 2 Feb 2017 22:32:43 +0000 (14:32 -0800)]
Add binder native side code for BatteryPropertiesListener
Test: build flash boot
Change-Id: Ic689797708e15eb6cdf5976130e5f91429210c0d
Jin Qian [Thu, 2 Feb 2017 22:32:09 +0000 (14:32 -0800)]
Build shared library for batteryservice
Test: build flash boot
Change-Id: Ifb6ac12ffbd23b457a455dce7ab050e8d8534fae
Alex Vakulenko [Thu, 2 Feb 2017 19:35:59 +0000 (11:35 -0800)]
Remove references to libchrome
Removed dependencies on libchrome which was used mostly for logging
and switched over to standard Android log macros.
Bug: None
Test: `m -j32` still succeeds
Change-Id: I0a841c19c15c02f9a031af200e82837f9450d88a
Fabien Sanglard [Thu, 2 Feb 2017 20:29:49 +0000 (20:29 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0" into nyc-mr2-dev-plus-aosp
am:
0ad3235330
Change-Id: Ibf1f56258c1421760eb4c7044fa0e85c7e1af248
Fabien Sanglard [Thu, 2 Feb 2017 20:29:47 +0000 (20:29 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0
am:
3c0b3e0b6f
Change-Id: Ieb4399ba0740fe711ab4459a7a196d58df111c2b
Fabien Sanglard [Thu, 2 Feb 2017 20:29:26 +0000 (20:29 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b" into nyc-mr2-dev-plus-aosp
am:
3e3a701e38
Change-Id: I6b36c03974b28612a89f55f3fc6c6e98a6169b3b
Fabien Sanglard [Thu, 2 Feb 2017 20:29:24 +0000 (20:29 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b
am:
0de664e6a8
Change-Id: I085a585040267aa6d72f84db65a9e77f38d4b455
Fabien Sanglard [Thu, 2 Feb 2017 20:29:05 +0000 (20:29 +0000)]
Merge "Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb" into nyc-mr2-dev-plus-aosp
am:
77aa001b19
Change-Id: Ide18cfcc31f8041a4b0afdae0a48e5a69935a8b3
Fabien Sanglard [Thu, 2 Feb 2017 20:29:03 +0000 (20:29 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb
am:
cf5b13aa09
Change-Id: Ie17e65a29fb90934a04d8ece10f2309526a82def
Fabien Sanglard [Thu, 2 Feb 2017 20:28:50 +0000 (20:28 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
41ab86fb1f
am:
9451234907
Change-Id: Ie90de6ee888c2a90a835bfb06cfd9c1eeadba100
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:07 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:04 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:59 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
64cae76fe0
Change-Id: I4ede153f15364c3e261e5e93c896ee79a084c2ec
Fabien Sanglard [Thu, 2 Feb 2017 20:22:57 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
a27b8d6f0b
Change-Id: Ia4ab81ceb6f16145b4f10128fc64038e48d19b44
Android Build Merger (Role) [Thu, 2 Feb 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:45 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
41ab86fb1f
Change-Id: I49c6fa4e733d05804495de9f5986d3430178d0f9
Fabien Sanglard [Thu, 2 Feb 2017 20:22:44 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
b6fa70b9fb
Change-Id: Ided7a6c942c7414f0d7bba3fd9e707b3f030380a
Fabien Sanglard [Thu, 2 Feb 2017 20:20:26 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: I6d86ae8db2bea689c6db821c6924b4dcde6f7c41
Fabien Sanglard [Thu, 2 Feb 2017 20:20:25 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: If10a72b8c856955a543cf695133b72161192b00b
Fabien Sanglard [Thu, 2 Feb 2017 20:20:14 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: I703ffd6b2a4ee5a7726bd7426f83256ad990835f
Fabien Sanglard [Thu, 2 Feb 2017 20:20:13 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: Ib4fad8fa8a393bc6233b842f0550db03708a65b1
Fabien Sanglard [Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8
am:
900cd6a1d2
Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c
Fabien Sanglard [Thu, 2 Feb 2017 20:18:12 +0000 (20:18 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2
am:
18a5e5f607
Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6
Fabien Sanglard [Thu, 2 Feb 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e
am:
80672db6b8
Change-Id: I5008bd9cd2b14dd52d261f5934024f7526e96f7f
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am:
45b202513b
am:
8778a131c2
Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
Fabien Sanglard [Thu, 2 Feb 2017 20:12:43 +0000 (20:12 +0000)]
Merge "Fix security vulnerability" into nyc-dev
am:
2188ad799e
Change-Id: Iac558b8fedbbfdd76ebe90867b70d57c33f8b644
Fabien Sanglard [Thu, 2 Feb 2017 20:12:42 +0000 (20:12 +0000)]
Fix security vulnerability
am:
45b202513b
Change-Id: Ifaf692c814e2562332914854dc95c7715d37a5c0
TreeHugger Robot [Thu, 2 Feb 2017 20:08:46 +0000 (20:08 +0000)]
Merge "Fix security vulnerability" into nyc-dev