From cbb5e07d9ad820aee8bf818f013a3f81eb420882 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Tue, 13 Feb 2018 11:09:42 -0800 Subject: [PATCH] Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE bug: 73085795 Change-Id: I19a3a4934d5e26a54f8875b8b517b5889c689b96 --- media/java/android/media/MediaCas.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java index ce50cc801daf..c5873e4ca34a 100644 --- a/media/java/android/media/MediaCas.java +++ b/media/java/android/media/MediaCas.java @@ -30,6 +30,7 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceSpecificException; +import android.util.EventLog; import android.util.Log; import android.util.Singleton; @@ -164,7 +165,11 @@ public final class MediaCas implements AutoCloseable { } private ParcelableCasData(Parcel in) { - this(); + EventLog.writeEvent(0x534e4554, "b/73085795", -1, ""); + + mData = in.createByteArray(); + mOffset = 0; + mLength = (mData == null) ? 0 : mData.length; } void set(@NonNull byte[] data, int offset, int length) { @@ -655,4 +660,4 @@ public final class MediaCas implements AutoCloseable { protected void finalize() { close(); } -} \ No newline at end of file +} -- 2.11.0