From 4c5397578a7c6ba28434728f8374a1674328858f Mon Sep 17 00:00:00 2001
From: lijilou <lijilou@xiaomi.corp-partner.google.com>
Date: Tue, 17 Dec 2024 21:38:06 +0800
Subject: 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 | 6 ++++--
 1 file 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;
     }
 
-- 
cgit v1.2.3-59-g8ed1b