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

Commit 5b93018b authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "Handling none listener case Fix the issue: NULL pointer(mEventHandler)... 

Merge "Handling none listener case Fix the issue: NULL pointer(mEventHandler) is accessed if the listener isn't set."
parents 2a24b360 7108493e

media/java/android/media/MediaCas.java

+17 −11
Original line number Original line Diff line number Diff line
@@ -362,13 +362,16 @@ public final class MediaCas implements AutoCloseable { 
        @Override

        @Override

        public void onEvent(int event, int arg, @Nullable ArrayList<Byte> data)

        public void onEvent(int event, int arg, @Nullable ArrayList<Byte> data)

                throws RemoteException {

                throws RemoteException {

            if (mEventHandler != null) {

                mEventHandler.sendMessage(mEventHandler.obtainMessage(

                mEventHandler.sendMessage(mEventHandler.obtainMessage(

                    EventHandler.MSG_CAS_EVENT, event, arg, data));

                    EventHandler.MSG_CAS_EVENT, event, arg, data));

            }

            }

        }

        @Override

        @Override

        public void onSessionEvent(@NonNull ArrayList<Byte> sessionId,

        public void onSessionEvent(@NonNull ArrayList<Byte> sessionId,

                int event, int arg, @Nullable ArrayList<Byte> data)

                int event, int arg, @Nullable ArrayList<Byte> data)

                throws RemoteException {

                throws RemoteException {

            if (mEventHandler != null) {

                Message msg = mEventHandler.obtainMessage();

                Message msg = mEventHandler.obtainMessage();

                msg.what = EventHandler.MSG_CAS_SESSION_EVENT;

                msg.what = EventHandler.MSG_CAS_SESSION_EVENT;

                msg.arg1 = event;

                msg.arg1 = event;
@@ -379,12 +382,15 @@ public final class MediaCas implements AutoCloseable { 
                msg.setData(bundle);

                msg.setData(bundle);

                mEventHandler.sendMessage(msg);

                mEventHandler.sendMessage(msg);

            }

            }

        }

        @Override

        @Override

        public void onStatusUpdate(byte status, int arg)

        public void onStatusUpdate(byte status, int arg)

                throws RemoteException {

                throws RemoteException {

            if (mEventHandler != null) {

                mEventHandler.sendMessage(mEventHandler.obtainMessage(

                mEventHandler.sendMessage(mEventHandler.obtainMessage(

                    EventHandler.MSG_CAS_STATUS_EVENT, status, arg));

                    EventHandler.MSG_CAS_STATUS_EVENT, status, arg));

            }

            }

        }

    };

    };





    private final TunerResourceManager.ResourcesReclaimListener mResourceListener =

    private final TunerResourceManager.ResourcesReclaimListener mResourceListener =