| commit | 419de098255f2b56301324da7c0a3dbc69cdbcbf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jul 16 18:03:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 16 18:03:03 2024 +0000 |
| tree | 61ab3b69017dd1179ea3d950ea67efbb6dcc43b2 | |
| parent | 4549d5583940eb7a31cedbd518ee761eec15466b [diff] | |
| parent | ce3845cad9fce747b9fe7933afac7c3aca18ef91 [diff] |
Merge "Fix exception when setTorchMode" into main am: ce3845cad9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3166676 Change-Id: Iec320caab92cee4cad8b27031cb4e54605632697 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/accessibility/java/com/android/server/accessibility/FlashNotificationsController.java b/services/accessibility/java/com/android/server/accessibility/FlashNotificationsController.java index e605514..2009cd3 100644 --- a/services/accessibility/java/com/android/server/accessibility/FlashNotificationsController.java +++ b/services/accessibility/java/com/android/server/accessibility/FlashNotificationsController.java
@@ -659,6 +659,8 @@ mIsTorchTouched = on; } catch (CameraAccessException e) { Log.e(LOG_TAG, "Failed to setTorchMode: " + e); + } catch (IllegalArgumentException e) { + Log.e(LOG_TAG, "Failed to setTorchMode: " + e); } } else { Log.e(LOG_TAG, "Can not use camera flash notification, please check CameraManager!");