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

Commit 245f729d authored by Venkatarama Avadhani's avatar Venkatarama Avadhani Committed by Yixiao Luo
Browse files

CAS: Fix integration issues with AIDL 

Fix issues with parameters and error handling in CAS AIDL integration
with framework.

Bug: 266169861
Test: atest CtsMediaMiscTestCases
Change-Id: I5d440ae8649782ce063d7879bb5f28f85b359362
parent 46720e79

media/java/android/media/MediaCas.java

+77 −34
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.Message; 
import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;

import android.util.Log;

import android.util.Singleton;
@@ -360,14 +361,14 @@ public final class MediaCas implements AutoCloseable { 
        @Override

        public void handleMessage(Message msg) {

            if (msg.what == MSG_CAS_EVENT) {

                mListener.onEvent(MediaCas.this, msg.arg1, msg.arg2,

                        toBytes((ArrayList<Byte>) msg.obj));

                byte[] data = (msg.obj == null) ? new byte[0] : (byte[]) msg.obj;

                mListener.onEvent(MediaCas.this, msg.arg1, msg.arg2, data);

            } else if (msg.what == MSG_CAS_SESSION_EVENT) {

                Bundle bundle = msg.getData();

                byte[] sessionId = bundle.getByteArray(SESSION_KEY);

                mListener.onSessionEvent(MediaCas.this,

                        createFromSessionId(sessionId), msg.arg1, msg.arg2,

                        bundle.getByteArray(DATA_KEY));

                byte[] data = bundle.getByteArray(DATA_KEY);

                mListener.onSessionEvent(

                        MediaCas.this, createFromSessionId(sessionId), msg.arg1, msg.arg2, data);

            } else if (msg.what == MSG_CAS_STATUS_EVENT) {

                if ((msg.arg1 == PLUGIN_STATUS_SESSION_NUMBER_CHANGED)

                        && (mTunerResourceManager != null)) {
@@ -599,7 +600,11 @@ public final class MediaCas implements AutoCloseable { 


            try {

                if (mICas != null) {

                    try {

                        mICas.setSessionPrivateData(mSessionId, data);

                    } catch (ServiceSpecificException se) {

                        MediaCasException.throwExceptionIfNeeded(se.errorCode);

                    }

                } else {

                    MediaCasException.throwExceptionIfNeeded(

                            mICasHidl.setSessionPrivateData(
@@ -628,7 +633,12 @@ public final class MediaCas implements AutoCloseable { 


            try {

                if (mICas != null) {

                    mICas.processEcm(mSessionId, data);

                    try {

                        mICas.processEcm(

                                mSessionId, Arrays.copyOfRange(data, offset, length + offset));

                    } catch (ServiceSpecificException se) {

                        MediaCasException.throwExceptionIfNeeded(se.errorCode);

                    }

                } else {

                    MediaCasException.throwExceptionIfNeeded(

                            mICasHidl.processEcm(
@@ -671,12 +681,14 @@ public final class MediaCas implements AutoCloseable { 
            validateSessionInternalStates();

            if (mICas != null) {

                try {

                    if (data == null) {

                        data = new byte[0];

                    }

                    mICas.sendSessionEvent(mSessionId, event, arg, data);

                } catch (RemoteException e) {

                    cleanupAndRethrowIllegalState();

                }

            }



            } else {

                if (mICasHidl11 == null) {

                    Log.d(TAG, "Send Session Event isn't supported by cas@1.0 interface");

                    throw new UnsupportedCasException("Send Session Event is not supported");
@@ -690,6 +702,7 @@ public final class MediaCas implements AutoCloseable { 
                    cleanupAndRethrowIllegalState();

                }

            }

        }



        /**

         * Get Session Id.
@@ -1038,7 +1051,11 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    mICas.setPrivateData(data);

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else {

                MediaCasException.throwExceptionIfNeeded(

                        mICasHidl.setPrivateData(toByteArray(data, 0, data.length)));
@@ -1127,6 +1144,7 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    byte[] sessionId = mICas.openSessionDefault();

                    Session session = createFromSessionId(sessionId);

                    Log.d(TAG, "Write Stats Log for succeed to Open Session.");
@@ -1136,6 +1154,9 @@ public final class MediaCas implements AutoCloseable { 
                            mCasSystemId,

                            FrameworkStatsLog.TV_CAS_SESSION_OPEN_STATUS__STATE__SUCCEEDED);

                    return session;

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else if (mICasHidl != null) {

                OpenSessionCallback cb = new OpenSessionCallback();

                mICasHidl.openSession(cb);
@@ -1193,7 +1214,7 @@ public final class MediaCas implements AutoCloseable { 
                        mCasSystemId,

                        FrameworkStatsLog.TV_CAS_SESSION_OPEN_STATUS__STATE__SUCCEEDED);

                return session;

            } catch (RemoteException e) {

            } catch (ServiceSpecificException | RemoteException e) {

                cleanupAndRethrowIllegalState();

            }

        }
@@ -1239,7 +1260,11 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    mICas.processEmm(Arrays.copyOfRange(data, offset, length));

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else {

                MediaCasException.throwExceptionIfNeeded(

                        mICasHidl.processEmm(toByteArray(data, offset, length)));
@@ -1282,7 +1307,14 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    if (data == null) {

                        data = new byte[0];

                    }

                    mICas.sendEvent(event, arg, data);

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else {

                MediaCasException.throwExceptionIfNeeded(

                        mICasHidl.sendEvent(event, arg, toByteArray(data)));
@@ -1308,7 +1340,11 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    mICas.provision(provisionString);

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else {

                MediaCasException.throwExceptionIfNeeded(mICasHidl.provision(provisionString));

            }
@@ -1333,7 +1369,14 @@ public final class MediaCas implements AutoCloseable { 


        try {

            if (mICas != null) {

                try {

                    if (refreshData == null) {

                        refreshData = new byte[0];

                    }

                    mICas.refreshEntitlements(refreshType, refreshData);

                } catch (ServiceSpecificException se) {

                    MediaCasException.throwExceptionIfNeeded(se.errorCode);

                }

            } else {

                MediaCasException.throwExceptionIfNeeded(

                        mICasHidl.refreshEntitlements(refreshType, toByteArray(refreshData)));

media/java/android/media/MediaDescrambler.java

+15 −5
Original line number Diff line number Diff line
@@ -66,8 +66,12 @@ public final class MediaDescrambler implements AutoCloseable { 


        IDescrambler mAidlDescrambler;



        AidlDescrambler(IDescrambler aidlDescrambler) {

        AidlDescrambler(IDescrambler aidlDescrambler) throws Exception {

            if (aidlDescrambler != null) {

                mAidlDescrambler = aidlDescrambler;

            } else {

                throw new Exception("Descrambler could not be created");

            }

        }



        @Override
@@ -104,9 +108,13 @@ public final class MediaDescrambler implements AutoCloseable { 


        IDescramblerBase mHidlDescrambler;



        HidlDescrambler(IDescramblerBase hidlDescrambler) {

        HidlDescrambler(IDescramblerBase hidlDescrambler) throws Exception {

            if (hidlDescrambler != null) {

                mHidlDescrambler = hidlDescrambler;

                native_setup(hidlDescrambler.asBinder());

            } else {

                throw new Exception("Descrambler could not be created");

            }

        }



        @Override
@@ -199,6 +207,8 @@ public final class MediaDescrambler implements AutoCloseable { 
                        new HidlDescrambler(

                                MediaCas.getServiceHidl().createDescrambler(CA_system_id));

                mIsAidlHal = false;

            } else {

                throw new Exception("No CAS service found!");

            }

        } catch(Exception e) {

            Log.e(TAG, "Failed to create descrambler: " + e);