diff options
| author | 2024-12-18 18:01:32 -0800 | |
|---|---|---|
| committer | 2024-12-18 18:01:32 -0800 | |
| commit | e85b1bb69579002980c079a3b886c83f095a6ceb (patch) | |
| tree | f204be31b9683ff23f5be35c35bcee189813d2df | |
| parent | fd60236dc95c3369a5a7fa9b4e6fd8f6ccf09449 (diff) | |
| parent | a865b4dee48319e01630b098a9da800432f3c87c (diff) | |
Merge "CameraStateMonitor:fix the potential NPE problem." into main am: 1fff2593ac am: a865b4dee4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3418361
Change-Id: I0fabeed711abdef90fdf462c6e893f7c86679e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/CameraStateMonitor.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/CameraStateMonitor.java b/services/core/java/com/android/server/wm/CameraStateMonitor.java index 3aa355869d85..00279921953d 100644 --- a/services/core/java/com/android/server/wm/CameraStateMonitor.java +++ b/services/core/java/com/android/server/wm/CameraStateMonitor.java @@ -110,8 +110,10 @@ class CameraStateMonitor { } void startListeningToCameraState() { - mCameraManager.registerAvailabilityCallback( - mWmService.mContext.getMainExecutor(), mAvailabilityCallback); + if (mCameraManager != null) { + mCameraManager.registerAvailabilityCallback( + mWmService.mContext.getMainExecutor(), mAvailabilityCallback); + } mIsRunning = true; } |