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

Commit e0cb7ab0 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "camera2: reduce logspam from cameraIdHasConcurrentStreams." into sc-dev am: 9d350e3a 

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

Change-Id: I8f8095c4a8bc7ae5f2cd33d8658c7dfd86d9777c
parents faf70f74 9d350e3a

core/java/android/hardware/camera2/CameraManager.java

+5 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,11 @@ public final class CameraManager { 
        */

        public boolean cameraIdHasConcurrentStreamsLocked(String cameraId) {

            if (!mDeviceStatus.containsKey(cameraId)) {

                Log.e(TAG, "cameraIdHasConcurrentStreamsLocked called on non existing camera id");

                // physical camera ids aren't advertised in concurrent camera id combinations.

                if (DEBUG) {

                    Log.v(TAG, " physical camera id " + cameraId + " is hidden." +

                            " Available logical camera ids : " + mDeviceStatus.toString());

                }

                return false;

            }

            for (Set<String> comb : mConcurrentCameraIdCombinations) {