Merge "Post creating the `android.bg` thread during app start up time for... (eff1be2a) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -5552,6 +5552,9 @@ public final class ViewRootImpl implements ViewParent,
		if (mAttachInfo.mContentCaptureManager != null) {
		ContentCaptureSession session =
		mAttachInfo.mContentCaptureManager.getMainContentCaptureSession();
		if (android.view.contentcapture.flags.Flags.postCreateAndroidBgThread()) {
		session.performStart();
		}
		session.notifyWindowBoundsChanged(session.getId(),
		getConfiguration().windowConfiguration.getBounds());
		}

core/java/android/view/contentcapture/ContentCaptureManager.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import android.view.contentcapture.ContentCaptureSession.FlushReason;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.util.RingBuffer;
		import com.android.internal.util.SyncResultReceiver;

		@@ -605,7 +604,6 @@ public final class ContentCaptureManager {
		mContext,
		this,
		prepareUiHandler(),
		prepareContentCaptureHandler(),
		mService
		);
		if (sVerbose) Log.v(TAG, "getMainContentCaptureSession(): created " + mMainSession);
		@@ -614,15 +612,6 @@ public final class ContentCaptureManager {
		}
		}

		@NonNull
		@GuardedBy("mLock")
		private Handler prepareContentCaptureHandler() {
		if (mContentCaptureHandler == null) {
		mContentCaptureHandler = BackgroundThread.getHandler();
		}
		return mContentCaptureHandler;
		}

		@NonNull
		@GuardedBy("mLock")
		private Handler prepareUiHandler() {

core/java/android/view/contentcapture/ContentCaptureSession.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,9 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		abstract void start(@NonNull IBinder token, @NonNull IBinder shareableActivityToken,
		@NonNull ComponentName component, int flags);

		/** @hide */
		public void performStart() {}

		abstract boolean isDisabled();

		/**

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

+108 −11

Original line number	Diff line number	Diff line
		@@ -57,10 +57,12 @@ import android.view.View;
		import android.view.ViewStructure;
		import android.view.autofill.AutofillId;
		import android.view.contentcapture.ViewNode.ViewStructureImpl;
		import android.view.contentcapture.flags.Flags;
		import android.view.contentprotection.ContentProtectionEventProcessor;
		import android.view.inputmethod.BaseInputConnection;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.os.IResultReceiver;
		import com.android.modules.expresslog.Counter;

		@@ -107,8 +109,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		@NonNull
		private final Handler mUiHandler;

		@NonNull
		private final Handler mContentCaptureHandler;
		/** @hide */
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		@Nullable
		public Handler mContentCaptureHandler;

		/**
		* Interface to the system_server binder object - it's only used to start the session (and
		@@ -187,6 +191,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		@Nullable
		public ContentProtectionEventProcessor mContentProtectionEventProcessor;

		/**
		* A runnable object to perform the start of this session.
		*/
		@Nullable
		private Runnable mStartRunnable = null;

		private static class SessionStateReceiver extends IResultReceiver.Stub {
		private final WeakReference<MainContentCaptureSession> mMainSession;

		@@ -198,7 +208,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		public void send(int resultCode, Bundle resultData) {
		final MainContentCaptureSession mainSession = mMainSession.get();
		if (mainSession == null) {
		Log.w(TAG, "received result after mina session released");
		Log.w(TAG, "received result after main session released");
		return;
		}
		final IBinder binder;
		@@ -213,6 +223,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		binder = resultData.getBinder(EXTRA_BINDER);
		if (binder == null) {
		Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result");
		// explicitly init the bg thread
		mainSession.mContentCaptureHandler = mainSession.prepareContentCaptureHandler();
		mainSession.runOnContentCaptureThread(() -> mainSession.resetSession(
		STATE_DISABLED \| STATE_INTERNAL_ERROR));
		return;
		@@ -220,23 +232,45 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		} else {
		binder = null;
		}
		// explicitly init the bg thread
		mainSession.mContentCaptureHandler = mainSession.prepareContentCaptureHandler();
		mainSession.runOnContentCaptureThread(() ->
		mainSession.onSessionStarted(resultCode, binder));
		}
		}

		/**
		* Prepares the content capture handler(i.e. the background thread).
		*
		* This is expected to be called from the {@link SessionStateReceiver#send} callback, after the
		* session {@link performStart}. This is expected to be executed in a binder thread, instead
		* of the UI thread.
		*/
		@NonNull
		private Handler prepareContentCaptureHandler() {
		if (mContentCaptureHandler == null) {
		try {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "prepareContentCaptureHandler");
		}
		mContentCaptureHandler = BackgroundThread.getHandler();
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}
		return mContentCaptureHandler;
		}

		/** @hide */
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PROTECTED)
		public MainContentCaptureSession(
		@NonNull ContentCaptureManager.StrippedContext context,
		@NonNull ContentCaptureManager manager,
		@NonNull Handler uiHandler,
		@NonNull Handler contentCaptureHandler,
		@NonNull IContentCaptureManager systemServerInterface) {
		mContext = context;
		mManager = manager;
		mUiHandler = uiHandler;
		mContentCaptureHandler = contentCaptureHandler;
		mSystemServerInterface = systemServerInterface;

		final int logHistorySize = mManager.mOptions.logHistorySize;
		@@ -260,18 +294,49 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		}

		/**
		* Starts this session.
		* Performs the start of the session.
		*
		* This is expected to be called from the UI thread, when the activity finishes its first frame.
		* This is a no-op if the session has already been started.
		*
		* See {@link #start(IBinder, IBinder, ComponentName, int)} for more details.
		*
		* @hide */
		@Override
		public void performStart() {
		if (!hasStarted() && mStartRunnable != null) {
		mStartRunnable.run();
		}
		}

		/**
		* Creates a runnable to start this session.
		*
		* For performance reasons, it is better to only create a task to start the session
		* during the creation of the activity and perform the actual start when the activity
		* finishes it's first frame.
		*/
		@Override
		void start(@NonNull IBinder token, @NonNull IBinder shareableActivityToken,
		@NonNull ComponentName component, int flags) {
		runOnContentCaptureThread(
		() -> startImpl(token, shareableActivityToken, component, flags));
		if (Flags.postCreateAndroidBgThread()) {
		mStartRunnable = () -> {
		try {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "cc session startImpl");
		}
		startImpl(token, shareableActivityToken, component, flags);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		};
		} else {
		startImpl(token, shareableActivityToken, component, flags);
		}
		}

		private void startImpl(@NonNull IBinder token, @NonNull IBinder shareableActivityToken,
		@NonNull ComponentName component, int flags) {
		checkOnContentCaptureThread();
		if (!isContentCaptureEnabled()) return;

		if (sVerbose) {
		@@ -305,6 +370,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		Log.w(TAG, "Error starting session for " + component.flattenToShortString() + ": " + e);
		}
		}

		@Override
		void onDestroy() {
		clearAndRunOnContentCaptureThread(() -> {
		@@ -561,7 +627,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		}

		private boolean hasStarted() {
		checkOnContentCaptureThread();
		return mState != UNKNOWN_STATE;
		}

		@@ -575,6 +640,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		if (sVerbose) Log.v(TAG, "handleScheduleFlush(): session not started yet");
		return;
		}
		if (mContentCaptureHandler == null) {
		Log.w(TAG, "handleScheduleFlush(" + getDebugState(reason) + "): content capture "
		+ "thread not ready");
		return;
		}

		if (mDisabled.get()) {
		// Should not be called on this state, as handleSendEvent checks.
		@@ -647,6 +717,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		if (!isContentCaptureReceiverEnabled()) {
		return;
		}
		if (mContentCaptureHandler == null) {
		Log.w(TAG, "handleForceFlush(" + getDebugState(reason) + "): content capture thread"
		+ "not ready");
		return;
		}

		if (mDirectServiceInterface == null) {
		if (sVerbose) {
		@@ -763,8 +838,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		}
		mDirectServiceInterface = null;
		mContentProtectionEventProcessor = null;
		if (mContentCaptureHandler != null) {
		mContentCaptureHandler.removeMessages(MSG_FLUSH);
		}
		}

		@Override
		void internalNotifyViewAppeared(int sessionId, @NonNull ViewStructureImpl node) {
		@@ -917,6 +994,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		* clear the buffer events then starting sending out current event.
		*/
		private void enqueueEvent(@NonNull final ContentCaptureEvent event, boolean forceFlush) {
		if (mContentCaptureHandler == null) {
		mEventProcessQueue.offer(event);
		return;
		}
		if (forceFlush \|\| mEventProcessQueue.size() >= mManager.mOptions.maxBufferSize - 1) {
		// The buffer events are cleared in the same thread first to prevent new events
		// being added during the time of context switch. This would disrupt the sequence
		@@ -1119,6 +1200,10 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		* always delegate to the assigned thread from {@code mHandler} for synchronization.</p>
		*/
		private void checkOnContentCaptureThread() {
		if (mContentCaptureHandler == null) {
		Log.e(TAG, "content capture thread is not initiallized!");
		return;
		}
		final boolean onContentCaptureThread = mContentCaptureHandler.getLooper().isCurrentThread();
		if (!onContentCaptureThread) {
		mWrongThreadCount.incrementAndGet();
		@@ -1139,6 +1224,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		* </p>
		*/
		private void runOnContentCaptureThread(@NonNull Runnable r) {
		if (mContentCaptureHandler == null) {
		Log.e(TAG, "content capture thread is not initiallized!");
		// fall back to UI thread
		runOnUiThread(r);
		return;
		}
		if (!mContentCaptureHandler.getLooper().isCurrentThread()) {
		mContentCaptureHandler.post(r);
		} else {
		@@ -1147,6 +1238,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
		}

		private void clearAndRunOnContentCaptureThread(@NonNull Runnable r, int what) {
		if (mContentCaptureHandler == null) {
		Log.e(TAG, "content capture thread is not initiallized!");
		// fall back to UI thread
		runOnUiThread(r);
		return;
		}
		if (!mContentCaptureHandler.getLooper().isCurrentThread()) {
		mContentCaptureHandler.removeMessages(what);
		mContentCaptureHandler.post(r);

core/java/android/view/contentcapture/flags/content_capture_flags.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,14 @@ flag {
		description: "Feature flag for baklava content capture API"
		bug: "380381249"
		}

		flag {
		name: "post_create_android_bg_thread"
		namespace: "pixel_state_server"
		description: "Feature flag to post create the bg thread when an app is in the allowlist"
		bug: "376468525"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}