commit 9285335221eb7c0f04bea841bd285e0986256aae
author Chih-hung Hsieh <chh@google.com> Wed Sep 28 23:02:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 23:02:33 2016 +0000
tree 33e2b0d575ad1a7d12f8de77e3bd2a318b3b989b
parent 5a283bbd40bc1ff454f472da79c87f6eb46372f2
parent c8de4a06abc98e67c2fba234a5a3a026742fd4db

Merge "Fix google-explicit-constructor warnings in  HardwareAPI."
am: c8de4a06ab

Change-Id: Ic8d39038699dd9bfa56bbdeb6f29293bad47d4f5

include/media/hardware/HardwareAPI.h

diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h
index 2c50ad6..cecf715 100644
--- a/include/media/hardware/HardwareAPI.h
+++ b/include/media/hardware/HardwareAPI.h
@@ -270,7 +270,7 @@
     // output: fill out the MediaImage fields
     MediaImage sMediaImage;
 
-    DescribeColorFormatParams(const DescribeColorFormat2Params&); // for internal use only
+    explicit DescribeColorFormatParams(const DescribeColorFormat2Params&); // for internal use only
 };
 
 // A pointer to this struct is passed to OMX_GetParameter when the extension