From 2584cda885964370f612a2b9251f7d6cf9ebf29a Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Sat, 7 May 2016 18:45:07 +0900
Subject: [PATCH] ExifInterface: Set mPosition in AssetStream with proper
 values

Bug: 28649955
Change-Id: I25ab833f54e4ee853d3b89af513b4ecd7dc02df9
---
 media/jni/android_media_Utils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/jni/android_media_Utils.cpp b/media/jni/android_media_Utils.cpp
index 62685c94453cf..359ebad5adbed 100644
--- a/media/jni/android_media_Utils.cpp
+++ b/media/jni/android_media_Utils.cpp
@@ -31,7 +31,7 @@
 namespace android {
 
 AssetStream::AssetStream(SkStream* stream)
-    : mStream(stream) {
+    : mStream(stream), mPosition(0) {
 }
 
 AssetStream::~AssetStream() {
@@ -48,7 +48,7 @@ piex::Error AssetStream::GetData(
 
     // Read bytes.
     size_t size = mStream->read((void*)data, length);
-    mPosition += size;
+    mPosition = offset + size;
 
     return size == length ? piex::Error::kOk : piex::Error::kFail;
 }