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

Commit 871ff919 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am:... 

Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c5 am: 8766dbaf am: 8e1a8334" into rvc-qpr-dev-plus-aosp am: 0d9f8e5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882491

Change-Id: I5e108123c38cedecb2dab0e902842418076738df
parents e6d336b9 0d9f8e5b

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

+45 −27
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.view.contentcapture.ViewNode.ViewStructureImpl; 
import com.android.internal.os.IResultReceiver;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;
@@ -146,45 +147,57 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
     * Binder object used to update the session state.

     */

    @NonNull

    private final IResultReceiver.Stub mSessionStateReceiver;

    private final SessionStateReceiver mSessionStateReceiver;



    protected MainContentCaptureSession(@NonNull Context context,

            @NonNull ContentCaptureManager manager, @NonNull Handler handler,

            @NonNull IContentCaptureManager systemServerInterface) {

        mContext = context;

        mManager = manager;

        mHandler = handler;

        mSystemServerInterface = systemServerInterface;

    private static class SessionStateReceiver extends IResultReceiver.Stub {

        private final WeakReference<MainContentCaptureSession> mMainSession;



        final int logHistorySize = mManager.mOptions.logHistorySize;

        mFlushHistory = logHistorySize > 0 ? new LocalLog(logHistorySize) : null;

        SessionStateReceiver(MainContentCaptureSession session) {

            mMainSession = new WeakReference<>(session);

        }



        mSessionStateReceiver = new IResultReceiver.Stub() {

        @Override

        public void send(int resultCode, Bundle resultData) {

            final MainContentCaptureSession mainSession = mMainSession.get();

            if (mainSession == null) {

                Log.w(TAG, "received result after mina session released");

                return;

            }

            final IBinder binder;

            if (resultData != null) {

                // Change in content capture enabled.

                final boolean hasEnabled = resultData.getBoolean(EXTRA_ENABLED_STATE);

                if (hasEnabled) {

                    final boolean disabled = (resultCode == RESULT_CODE_FALSE);

                        mDisabled.set(disabled);

                    mainSession.mDisabled.set(disabled);

                    return;

                }

                binder = resultData.getBinder(EXTRA_BINDER);

                if (binder == null) {

                    Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result");

                        mHandler.post(() -> resetSession(

                    mainSession.mHandler.post(() -> mainSession.resetSession(

                            STATE_DISABLED | STATE_INTERNAL_ERROR));

                    return;

                }

            } else {

                binder = null;

            }

                mHandler.post(() -> onSessionStarted(resultCode, binder));

            mainSession.mHandler.post(() -> mainSession.onSessionStarted(resultCode, binder));

        }

        };

    }



    protected MainContentCaptureSession(@NonNull Context context,

            @NonNull ContentCaptureManager manager, @NonNull Handler handler,

            @NonNull IContentCaptureManager systemServerInterface) {

        mContext = context;

        mManager = manager;

        mHandler = handler;

        mSystemServerInterface = systemServerInterface;



        final int logHistorySize = mManager.mOptions.logHistorySize;

        mFlushHistory = logHistorySize > 0 ? new LocalLog(logHistorySize) : null;



        mSessionStateReceiver = new SessionStateReceiver(this);

    }



    @Override
@@ -543,6 +556,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession { 
            Log.e(TAG, "Error destroying system-service session " + mId + " for "

                    + getDebugState() + ": " + e);

        }



        if (mDirectServiceInterface != null) {

            mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0);

        }

        mDirectServiceInterface = null;

    }



    // TODO(b/122454205): once we support multiple sessions, we might need to move some of these