commit be1700776563248f0b4213a2f734a10e08618d5b
author Jooyung Han <jooyung@google.com> Mon Mar 04 18:36:16 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Mar 04 18:36:16 2019 -0800
tree 53d7eccc9e875d823b8428100b9012fe83956b92
parent ee3eb46566b21e4b1c762a6f9aec8c64d94f7b0f
parent 70c94ca4de3e747f36325793888bee09af9b0cbf

Merge "Use PublicFormat from libui" am: 7e7836e3e1
am: 70c94ca4de

Change-Id: I1dbe6b08fcc5651ba73c80c8f52558f31d98307f

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index 9fc75f0..15f3237 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -261,8 +261,8 @@
 media_status_t
 AImageReader::init() {
     PublicFormat publicFormat = static_cast<PublicFormat>(mFormat);
-    mHalFormat = android_view_Surface_mapPublicFormatToHalFormat(publicFormat);
-    mHalDataSpace = android_view_Surface_mapPublicFormatToHalDataspace(publicFormat);
+    mHalFormat = mapPublicFormatToHalFormat(publicFormat);
+    mHalDataSpace = mapPublicFormatToHalDataspace(publicFormat);
     mHalUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);
 
     sp<IGraphicBufferProducer> gbProducer;