Merge "[AE Triage Improvement] Add log to indicate AE is used" into main (4ce39bf5) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.ActivityTaskManager;
		import android.app.ActivityThread;
		import android.app.Application;
		import android.content.Context;
		import android.util.Log;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		@@ -40,12 +41,17 @@ import java.util.Objects;
		*/
		public class WindowExtensionsImpl implements WindowExtensions {

		private static final String TAG = "WindowExtensionsImpl";
		private final Object mLock = new Object();
		private volatile DeviceStateManagerFoldingFeatureProducer mFoldingFeatureProducer;
		private volatile WindowLayoutComponentImpl mWindowLayoutComponent;
		private volatile SplitController mSplitController;
		private volatile WindowAreaComponent mWindowAreaComponent;

		public WindowExtensionsImpl() {
		Log.i(TAG, "Initializing Window Extensions.");
		}

		// TODO(b/241126279) Introduce constants to better version functionality
		@Override
		public int getVendorApiLevel() {

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen

		public SplitController(@NonNull WindowLayoutComponentImpl windowLayoutComponent,
		@NonNull DeviceStateManagerFoldingFeatureProducer foldingFeatureProducer) {
		Log.i(TAG, "Initializing Activity Embedding Controller.");
		final MainThreadExecutor executor = new MainThreadExecutor();
		mHandler = executor.mHandler;
		mPresenter = new SplitPresenter(executor, windowLayoutComponent, this);
		@@ -208,6 +209,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		@Override
		public void setEmbeddingRules(@NonNull Set<EmbeddingRule> rules) {
		synchronized (mLock) {
		Log.i(TAG, "Setting embedding rules. Size: " + rules.size());
		mSplitRules.clear();
		mSplitRules.addAll(rules);
		}
		@@ -216,6 +218,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		@Override
		public boolean pinTopActivityStack(int taskId, @NonNull SplitPinRule splitPinRule) {
		synchronized (mLock) {
		Log.i(TAG, "Request to pin top activity stack.");
		final TaskContainer task = getTaskContainer(taskId);
		if (task == null) {
		Log.e(TAG, "Cannot find the task for id: " + taskId);
		@@ -272,6 +275,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		@Override
		public void unpinTopActivityStack(int taskId){
		synchronized (mLock) {
		Log.i(TAG, "Request to unpin top activity stack.");
		final TaskContainer task = getTaskContainer(taskId);
		if (task == null) {
		Log.e(TAG, "Cannot find the task to unpin, id: " + taskId);