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

Commit 58611544 authored by Adam He's avatar Adam He Committed by Android (Google) Code Review
Browse files

Merge "Added null checks for NPE on mSystemServerInterface"

parents fd179b0f 6884fed0

core/java/android/view/contentcapture/MainContentCaptureSession.java

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
        final int flags = 0; // TODO(b/111276913): get proper flags



        try {

            if (mSystemServerInterface == null) return;



            mSystemServerInterface.startSession(mContext.getUserId(), mApplicationToken,

                    componentName, mId, flags, new IResultReceiver.Stub() {

                        @Override
@@ -383,6 +385,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
        }



        try {

            if (mSystemServerInterface == null) return;



            mSystemServerInterface.finishSession(mContext.getUserId(), mId);

        } catch (RemoteException e) {

            Log.e(TAG, "Error destroying system-service session " + mId + " for "