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

Commit 88732135 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Unregister all successfully connected extension clients" into main

parents 96d13243 733a34c7

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+4 −3
Original line number Diff line number Diff line
@@ -829,10 +829,11 @@ public final class CameraExtensionCharacteristics { 
                final IBinder token = new Binder(TAG + "#getSupportedExtensions:" + mCameraId);

                boolean success = registerClient(mContext, token, extensionType, mCameraId,

                        mCharacteristicsMapNative);

                if (success && isExtensionSupported(mCameraId, extensionType,

                        mCharacteristicsMapNative)) {

                    ret.add(extensionType);

                if (success) {

                    tokens.put(extensionType, token);

                    if (isExtensionSupported(mCameraId, extensionType, mCharacteristicsMapNative)) {

                        ret.add(extensionType);

                    }

                }

            }

        } finally {