commit c26fabff2ab012b65c8074d93535e999553bb458
author Alex Salo <asalo@google.com> Wed May 05 04:12:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 05 04:12:38 2021 +0000
tree 4160ce19d45d5a42b5506072b3e40e8b230d7ff2
parent 9abe5df134989672f177991e03e020bc6502ba21
parent 0f402e0caef278a48b2c1d01ba6051c7802d152b

Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev

src/com/android/settings/display/SmartAutoRotateCameraStateController.java

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