Merge "Extract camera open/close logic in a separate class." into main (f0694c53) · Commits · e / os / android_frameworks_base

data/etc/core.protolog.pb

−110 B (52.8 KiB)

File changed.

No diff preview for this file type.

data/etc/services.core.protolog.json

+22 −16

Original line number	Diff line number	Diff line
		@@ -1117,6 +1117,24 @@
		"group": "WM_SHOW_SURFACE_ALLOC",
		"at": "com\/android\/server\/wm\/BlackFrame.java"
		},
		"5256889109971284149": {
		"message": "CameraManager cannot be found.",
		"level": "ERROR",
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/CameraStateMonitor.java"
		},
		"8116030277393789125": {
		"message": "Display id=%d is notified that Camera %s is open for package %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/CameraStateMonitor.java"
		},
		"-3774458166471278611": {
		"message": "Display id=%d is notified that Camera %s is closed.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_STATES",
		"at": "com\/android\/server\/wm\/CameraStateMonitor.java"
		},
		"-74949168947384056": {
		"message": "Sending to proc %s new compat %s",
		"level": "VERBOSE",
		@@ -1771,32 +1789,20 @@
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"
		},
		"-8302211458579221117": {
		"message": "Display id=%d is notified that Camera %s is open for package %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"
		},
		"-1534784331886673955": {
		"message": "DisplayRotationCompatPolicy: Multi-window toast not shown as package '%s' cannot be found.",
		"level": "ERROR",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"
		},
		"1797195804376906831": {
		"message": "Display id=%d is notified that Camera %s is closed, scheduling rotation update.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"
		},
		"-8746776274432739264": {
		"message": "Display id=%d is notified that Camera %s is closed but activity is still refreshing. Rescheduling an update.",
		"-5121743609317543819": {
		"message": "Display id=%d is notified that camera is closed but activity is still refreshing. Rescheduling an update.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"
		},
		"3622181214422515679": {
		"message": "Display id=%d is notified that Camera %s is closed, updating rotation.",
		"1769752961776628557": {
		"message": "Display id=%d is notified that Camera is closed, updating rotation.",
		"level": "VERBOSE",
		"group": "WM_DEBUG_ORIENTATION",
		"at": "com\/android\/server\/wm\/DisplayRotationCompatPolicy.java"

services/core/java/com/android/server/wm/CameraStateMonitor.java

0 → 100644

+287 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.server.wm;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_STATES;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.hardware.camera2.CameraManager;
		import android.os.Handler;
		import android.util.ArraySet;
		import android.util.Slog;

		import com.android.internal.protolog.common.ProtoLog;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Set;

		/**
		* Class that listens to camera open/closed signals, keeps track of the current apps using camera,
		* and notifies listeners.
		*/
		class CameraStateMonitor {
		private static final String TAG = TAG_WITH_CLASS_NAME ? "CameraStateMonitor" : TAG_WM;

		// Delay for updating letterbox after Camera connection is closed. Needed to avoid flickering
		// when an app is flipping between front and rear cameras or when size compat mode is restarted.
		// TODO(b/330148095): Investigate flickering without using delays, remove them if possible.
		private static final int CAMERA_CLOSED_LETTERBOX_UPDATE_DELAY_MS = 2000;
		// Delay for updating letterboxing after Camera connection is opened. This delay is selected to
		// be long enough to avoid conflicts with transitions on the app's side.
		// Using a delay < CAMERA_CLOSED_ROTATION_UPDATE_DELAY_MS to avoid flickering when an app
		// is flipping between front and rear cameras (in case requested orientation changes at
		// runtime at the same time) or when size compat mode is restarted.
		// TODO(b/330148095): Investigate flickering without using delays, remove them if possible.
		private static final int CAMERA_OPENED_LETTERBOX_UPDATE_DELAY_MS =
		CAMERA_CLOSED_LETTERBOX_UPDATE_DELAY_MS / 2;

		@NonNull
		private final DisplayContent mDisplayContent;
		@NonNull
		private final WindowManagerService mWmService;
		@Nullable
		private final CameraManager mCameraManager;
		@NonNull
		private final Handler mHandler;

		@Nullable
		private ActivityRecord mCameraActivity;

		// Bi-directional map between package names and active camera IDs since we need to 1) get a
		// camera id by a package name when resizing the window; 2) get a package name by a camera id
		// when camera connection is closed and we need to clean up our records.
		private final CameraIdPackageNameBiMapping mCameraIdPackageBiMapping =
		new CameraIdPackageNameBiMapping();
		private final Set<String> mScheduledToBeRemovedCameraIdSet = new ArraySet<>();

		// TODO(b/336474959): should/can this go in the compat listeners?
		private final Set<String> mScheduledCompatModeUpdateCameraIdSet = new ArraySet<>();

		private final ArrayList<CameraCompatStateListener> mCameraStateListeners = new ArrayList<>();

		/**
		* {@link CameraCompatStateListener} which returned {@code true} on the last {@link
		* CameraCompatStateListener#onCameraOpened(ActivityRecord, String)}, if any.
		*
		* <p>This allows the {@link CameraStateMonitor} to notify a particular listener when camera
		* closes, so they can revert any changes.
		*/
		@Nullable
		private CameraCompatStateListener mCurrentListenerForCameraActivity;

		private final CameraManager.AvailabilityCallback mAvailabilityCallback =
		new CameraManager.AvailabilityCallback() {
		@Override
		public void onCameraOpened(@NonNull String cameraId, @NonNull String packageId) {
		synchronized (mWmService.mGlobalLock) {
		notifyCameraOpened(cameraId, packageId);
		}
		}
		@Override
		public void onCameraClosed(@NonNull String cameraId) {
		synchronized (mWmService.mGlobalLock) {
		notifyCameraClosed(cameraId);
		}
		}
		};

		CameraStateMonitor(@NonNull DisplayContent displayContent, @NonNull Handler handler) {
		// This constructor is called from DisplayContent constructor. Don't use any fields in
		// DisplayContent here since they aren't guaranteed to be set.
		mHandler = handler;
		mDisplayContent = displayContent;
		mWmService = displayContent.mWmService;
		mCameraManager = mWmService.mContext.getSystemService(CameraManager.class);
		}

		void startListeningToCameraState() {
		mCameraManager.registerAvailabilityCallback(
		mWmService.mContext.getMainExecutor(), mAvailabilityCallback);
		}

		/** Releases camera callback listener. */
		void dispose() {
		if (mCameraManager != null) {
		mCameraManager.unregisterAvailabilityCallback(mAvailabilityCallback);
		}
		}

		void addCameraStateListener(CameraCompatStateListener listener) {
		mCameraStateListeners.add(listener);
		}

		void removeCameraStateListener(CameraCompatStateListener listener) {
		mCameraStateListeners.remove(listener);
		}

		private void notifyCameraOpened(
		@NonNull String cameraId, @NonNull String packageName) {
		// If an activity is restarting or camera is flipping, the camera connection can be
		// quickly closed and reopened.
		mScheduledToBeRemovedCameraIdSet.remove(cameraId);
		ProtoLog.v(WM_DEBUG_STATES,
		"Display id=%d is notified that Camera %s is open for package %s",
		mDisplayContent.mDisplayId, cameraId, packageName);
		// Some apps can’t handle configuration changes coming at the same time with Camera setup so
		// delaying orientation update to accommodate for that.
		mScheduledCompatModeUpdateCameraIdSet.add(cameraId);
		mHandler.postDelayed(
		() -> {
		synchronized (mWmService.mGlobalLock) {
		if (!mScheduledCompatModeUpdateCameraIdSet.remove(cameraId)) {
		// Camera compat mode update has happened already or was cancelled
		// because camera was closed.
		return;
		}
		mCameraIdPackageBiMapping.put(packageName, cameraId);
		mCameraActivity = findCameraActivity(packageName);
		if (mCameraActivity == null \|\| mCameraActivity.getTask() == null) {
		return;
		}
		notifyListenersCameraOpened(mCameraActivity, cameraId);
		}
		},
		CAMERA_OPENED_LETTERBOX_UPDATE_DELAY_MS);
		}

		private void notifyListenersCameraOpened(@NonNull ActivityRecord cameraActivity,
		@NonNull String cameraId) {
		for (int i = 0; i < mCameraStateListeners.size(); i++) {
		CameraCompatStateListener listener = mCameraStateListeners.get(i);
		boolean activeCameraTreatment = listener.onCameraOpened(
		cameraActivity, cameraId);
		if (activeCameraTreatment) {
		mCurrentListenerForCameraActivity = listener;
		break;
		}
		}
		}

		private void notifyCameraClosed(@NonNull String cameraId) {
		ProtoLog.v(WM_DEBUG_STATES,
		"Display id=%d is notified that Camera %s is closed.",
		mDisplayContent.mDisplayId, cameraId);
		mScheduledToBeRemovedCameraIdSet.add(cameraId);
		// No need to update window size for this camera if it's already closed.
		mScheduledCompatModeUpdateCameraIdSet.remove(cameraId);
		scheduleRemoveCameraId(cameraId);
		}

		boolean isCameraRunningForActivity(@NonNull ActivityRecord activity) {
		return getCameraIdForActivity(activity) != null;
		}

		// TODO(b/336474959): try to decouple `cameraId` from the listeners.
		boolean isCameraWithIdRunningForActivity(@NonNull ActivityRecord activity, String cameraId) {
		return cameraId.equals(getCameraIdForActivity(activity));
		}

		void rescheduleRemoveCameraActivity(@NonNull String cameraId) {
		mScheduledToBeRemovedCameraIdSet.add(cameraId);
		scheduleRemoveCameraId(cameraId);
		}

		@Nullable
		private String getCameraIdForActivity(@NonNull ActivityRecord activity) {
		return mCameraIdPackageBiMapping.getCameraId(activity.packageName);
		}

		// Delay is needed to avoid rotation flickering when an app is flipping between front and
		// rear cameras, when size compat mode is restarted or activity is being refreshed.
		private void scheduleRemoveCameraId(@NonNull String cameraId) {
		mHandler.postDelayed(
		() -> removeCameraId(cameraId),
		CAMERA_CLOSED_LETTERBOX_UPDATE_DELAY_MS);
		}

		private void removeCameraId(@NonNull String cameraId) {
		synchronized (mWmService.mGlobalLock) {
		if (!mScheduledToBeRemovedCameraIdSet.remove(cameraId)) {
		// Already reconnected to this camera, no need to clean up.
		return;
		}
		if (mCameraActivity != null && mCurrentListenerForCameraActivity != null) {
		boolean closeSuccessful =
		mCurrentListenerForCameraActivity.onCameraClosed(mCameraActivity, cameraId);
		if (closeSuccessful) {
		mCameraIdPackageBiMapping.removeCameraId(cameraId);
		mCurrentListenerForCameraActivity = null;
		} else {
		rescheduleRemoveCameraActivity(cameraId);
		}
		}
		}
		}

		// TODO(b/335165310): verify that this works in multi instance and permission dialogs.
		@Nullable
		private ActivityRecord findCameraActivity(@NonNull String packageName) {
		final ActivityRecord topActivity = mDisplayContent.topRunningActivity(
		/* considerKeyguardState= */ true);
		if (topActivity != null && topActivity.packageName.equals(packageName)) {
		return topActivity;
		}

		final List<ActivityRecord> activitiesOfPackageWhichOpenedCamera = new ArrayList<>();
		mDisplayContent.forAllActivities(activityRecord -> {
		if (activityRecord.isVisibleRequested()
		&& activityRecord.packageName.equals(packageName)) {
		activitiesOfPackageWhichOpenedCamera.add(activityRecord);
		}
		});

		if (activitiesOfPackageWhichOpenedCamera.isEmpty()) {
		Slog.w(TAG, "Cannot find camera activity.");
		return null;
		}

		if (activitiesOfPackageWhichOpenedCamera.size() == 1) {
		return activitiesOfPackageWhichOpenedCamera.getFirst();
		}

		// Return null if we cannot determine which activity opened camera. This is preferred to
		// applying treatment to the wrong activity.
		Slog.w(TAG, "Cannot determine which activity opened camera.");
		return null;
		}

		String getSummary() {
		return " CameraIdPackageNameBiMapping="
		+ mCameraIdPackageBiMapping
		.getSummaryForDisplayRotationHistoryRecord();
		}

		interface CameraCompatStateListener {
		/**
		* Notifies the compat listener that an activity has opened camera.
		*
		* @return true if the treatment has been applied.
		*/
		// TODO(b/336474959): try to decouple `cameraId` from the listeners.
		boolean onCameraOpened(@NonNull ActivityRecord cameraActivity, @NonNull String cameraId);
		/**
		* Notifies the compat listener that an activity has closed the camera.
		*
		* @return true if cleanup has been successful - the notifier might try again if false.
		*/
		// TODO(b/336474959): try to decouple `cameraId` from the listeners.
		boolean onCameraClosed(@NonNull ActivityRecord cameraActivity, @NonNull String cameraId);
		}
		}

services/core/java/com/android/server/wm/DisplayContent.java

+26 −6

Original line number	Diff line number	Diff line
		@@ -473,7 +473,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		private final DisplayMetrics mDisplayMetrics = new DisplayMetrics();
		private final DisplayPolicy mDisplayPolicy;
		private final DisplayRotation mDisplayRotation;
		@Nullable final DisplayRotationCompatPolicy mDisplayRotationCompatPolicy;

		@Nullable
		final DisplayRotationCompatPolicy mDisplayRotationCompatPolicy;
		@Nullable
		final CameraStateMonitor mCameraStateMonitor;

		DisplayFrames mDisplayFrames;
		final DisplayUpdater mDisplayUpdater;

		@@ -1247,11 +1252,23 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		onDisplayChanged(this);
		updateDisplayAreaOrganizers();

		mDisplayRotationCompatPolicy =
		// Not checking DeviceConfig value here to allow enabling via DeviceConfig
		// without the need to restart the device.
		mWmService.mLetterboxConfiguration.isCameraCompatTreatmentEnabledAtBuildTime()
		? new DisplayRotationCompatPolicy(this) : null;
		final boolean shouldCreateDisplayRotationCompatPolicy =
		mWmService.mLetterboxConfiguration.isCameraCompatTreatmentEnabledAtBuildTime();
		if (shouldCreateDisplayRotationCompatPolicy) {
		mCameraStateMonitor = new CameraStateMonitor(this, mWmService.mH);
		mDisplayRotationCompatPolicy = new DisplayRotationCompatPolicy(
		this, mWmService.mH, mCameraStateMonitor);

		mCameraStateMonitor.startListeningToCameraState();
		} else {
		// These are to satisfy the `final` check.
		mCameraStateMonitor = null;
		mDisplayRotationCompatPolicy = null;
		}


		mRotationReversionController = new DisplayRotationReversionController(this);

		mInputMonitor = new InputMonitor(mWmService, this);
		@@ -3453,6 +3470,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		if (mDisplayRotationCompatPolicy != null) {
		mDisplayRotationCompatPolicy.dispose();
		}
		if (mCameraStateMonitor != null) {
		mCameraStateMonitor.dispose();
		}
		}

		/** Returns true if a removal action is still being deferred. */

services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java

+69 −154

File changed.

Preview size limit exceeded, changes collapsed.