commit 4c5397578a7c6ba28434728f8374a1674328858f
author lijilou <lijilou@xiaomi.corp-partner.google.com> Tue Dec 17 21:38:06 2024 +0800
committer Jilou li <lijilou@xiaomi.corp-partner.google.com> Tue Dec 17 05:43:04 2024 -0800
tree 43beab488be2598a7d9b70b5e5699e6c82052004
parent 978dbf9c725423eae43bbcbe6c8a1f5993c2a4ce

CameraStateMonitor:fix the potential NPE problem.

The camera manager service may be not publish before the  DisplayContent constructor.

Bug: none
Flag: EXEMPT minor optimization
Change-Id: I370504b88c088f354dee80598372d29ea0827161

services/core/java/com/android/server/wm/CameraStateMonitor.java

diff --git a/services/core/java/com/android/server/wm/CameraStateMonitor.java b/services/core/java/com/android/server/wm/CameraStateMonitor.java
index 8bfef6d..4140c04 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 @@
     }
 
     void startListeningToCameraState() {
-        mCameraManager.registerAvailabilityCallback(
-                mWmService.mContext.getMainExecutor(), mAvailabilityCallback);
+        if (mCameraManager != null) {
+            mCameraManager.registerAvailabilityCallback(
+                    mWmService.mContext.getMainExecutor(), mAvailabilityCallback);
+        }
         mIsRunning = true;
     }