From 0f402e0caef278a48b2c1d01ba6051c7802d152b Mon Sep 17 00:00:00 2001
From: Abel Tesfaye <tesfaye@google.com>
Date: Mon, 12 Apr 2021 19:29:06 +0000
Subject: [PATCH] Fix NullPointerException in
 SmartAutoRotateCameraStateController

Test: none

Bug: 184844470
Change-Id: I9eca78b11ff8a70dc7c026d7ef77e0b08db8ffbe
---
 .../display/SmartAutoRotateCameraStateController.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/display/SmartAutoRotateCameraStateController.java b/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
index 9e2a7848d81..a17a903532e 100644
--- a/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
+++ b/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
@@ -44,7 +44,9 @@ public class SmartAutoRotateCameraStateController extends BasePreferenceControll
         super(context, key);
         mPrivacyManager = SensorPrivacyManager.getInstance(context);
         mPrivacyManager.addSensorPrivacyListener(CAMERA, (sensor, enabled) -> {
-            mPreference.setVisible(enabled);
+            if (mPreference != null) {
+                mPreference.setVisible(enabled);
+            }
             updateState(mPreference);
         });
     }