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

Commit b00964f0 authored by Michelle Ho's avatar Michelle Ho Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix physical camera availability update" into tm-qpr-dev am:... 

Merge "Camera: Fix physical camera availability update" into tm-qpr-dev am: 608b9ec7 am: 14048f1d

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



Change-Id: I6497551ed14fb688164ccdcdf833a8e580532d3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16d39ebe 14048f1d

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

+8 −3
Original line number Diff line number Diff line
@@ -2387,9 +2387,8 @@ public final class CameraManager { 
            }



            //TODO: Do we need to treat this as error?

            if (!mDeviceStatus.containsKey(id) || !isAvailable(mDeviceStatus.get(id))

                    || !mUnavailablePhysicalDevices.containsKey(id)) {

                Log.e(TAG, String.format("Camera %s is not available. Ignore physical camera "

            if (!mDeviceStatus.containsKey(id) || !mUnavailablePhysicalDevices.containsKey(id)) {

                Log.e(TAG, String.format("Camera %s is not present. Ignore physical camera "

                        + "status change", id));

                return;

            }
@@ -2414,6 +2413,12 @@ public final class CameraManager { 
                return;

            }



            if (!isAvailable(mDeviceStatus.get(id))) {

                Log.i(TAG, String.format("Camera %s is not available. Ignore physical camera "

                        + "status change callback(s)", id));

                return;

            }



            final int callbackCount = mCallbackMap.size();

            for (int i = 0; i < callbackCount; i++) {

                Executor executor = mCallbackMap.valueAt(i);