Fix an IllegalStateException introduced by ag/413832.

Change-Id: Ib160c313af4e60215a9a91b93a2ec2506a06c5d2

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 4e240b6..7a0be96 100644 (file)
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -842,7 +842,9 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
     // TODO: Remove this when refactor is done.
     // This is here to ensure refactored modules can work with not-yet-refactored ones.
     public void clearCameraUI() {
-        mController.getSettingsManager().removeListener(mIndicatorIconController);
+        if (mIndicatorIconController != null) {
+            mController.getSettingsManager().removeListener(mIndicatorIconController);
+        }
         mCameraRootView.removeAllViews();
         mModuleUI = null;
         mTextureView = null;