Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e85b1bb6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CameraStateMonitor:fix the potential NPE problem." into main am: 1fff2593 am: a865b4de 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3418361



Change-Id: I0fabeed711abdef90fdf462c6e893f7c86679e1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd60236d a865b4de

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

+4 −2
Original line number Diff line number Diff line
@@ -110,8 +110,10 @@ class CameraStateMonitor { 
    }



    void startListeningToCameraState() {

        if (mCameraManager != null) {

            mCameraManager.registerAvailabilityCallback(

                    mWmService.mContext.getMainExecutor(), mAvailabilityCallback);

        }

        mIsRunning = true;

    }