Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0e5b6a authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev 

am: 5d2153d1

Change-Id: I04e026a96e1899ba9496979561df5680297f546a
parents c3f0a8e2 5d2153d1

media/java/android/media/MediaCas.java

+7 −2
Original line number Diff line number Diff line
@@ -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) {