diff options
| author | 2024-12-18 17:36:12 -0800 | |
|---|---|---|
| committer | 2024-12-18 17:36:12 -0800 | |
| commit | a865b4dee48319e01630b098a9da800432f3c87c (patch) | |
| tree | 6916f89a3b6c6f63c7cee08508a96921c4d3add0 | |
| parent | feeaba772555cc2f47d68296d8adc2f82610765c (diff) | |
| parent | 1fff2593ac9fa2f1e8734ffd5e7a7df8c742a531 (diff) | |
Merge "CameraStateMonitor:fix the potential NPE problem." into main am: 1fff2593ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3418361
Change-Id: Id3f6174441ffeae34a0b7913398bac732151613a
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 8bfef6d5d218..4140c046f968 100644 --- a/services/core/java/com/android/server/wm/CameraStateMonitor.java +++ b/services/core/java/com/android/server/wm/CameraStateMonitor.java @@ -106,8 +106,10 @@ class CameraStateMonitor { } void startListeningToCameraState() { - mCameraManager.registerAvailabilityCallback( - mWmService.mContext.getMainExecutor(), mAvailabilityCallback); + if (mCameraManager != null) { + mCameraManager.registerAvailabilityCallback( + mWmService.mContext.getMainExecutor(), mAvailabilityCallback); + } mIsRunning = true; } |