From fc8049aa364d5066902a54417e7bb899ccc2b103 Mon Sep 17 00:00:00 2001 From: Ravneet Dhanjal Date: Thu, 3 Oct 2024 22:10:55 +0000 Subject: Camera: Catch SecurityException for UID state changes - AppOps might send the notification of a UID change faster than a camera app can execute a release sequence leading to an exception Bug: 368768937 Test: Camera CTS Flag: EXEMPT Bug fix Change-Id: I958ab4a1c5017891178eeaf1b960da2a7ad820e7 --- core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java index b9eba9c1d541..ce8661e90978 100644 --- a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java @@ -1028,6 +1028,9 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession // Camera is already closed, so nothing left to do if (DEBUG) Log.v(TAG, mIdString + "Camera was already closed or busy, skipping unconfigure"); + } catch (SecurityException e) { + // UID state change revoked camera permission + Log.e(TAG, mIdString + "Exception while unconfiguring outputs: ", e); } } } -- cgit v1.2.3-59-g8ed1b