commit 68dab67de2d9d254f5e71b6b8912f3c940eda1fd
author Udam Saini <udam@google.com> Tue Mar 29 10:49:18 2016 -0700
committer Udam Saini <udam@google.com> Tue Mar 29 10:55:01 2016 -0700
tree 4844daa3ac80ca736400cc014b16c7cf3f944523
parent 160222a4390d7738b541ed3f5c116d22c1fda04b

Calling setIsDrawerPresent(false) twice causes a crash.

We should only call setDrawerLockMode(...) if mDrawerLayout isn't
null.

bug:26288300
Change-Id: I8a1b77e03414360f9cd7e3fa6e6c98ef0e139ebf

packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index 64910fd..c3a5089 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -155,8 +155,10 @@
             mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
             updateDrawer();
         } else {
-            mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
-            mDrawerLayout = null;
+            if (mDrawerLayout != null) {
+                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+                mDrawerLayout = null;
+            }
         }
     }