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

Commit 724fb136 authored by Udam Saini's avatar Udam Saini Committed by android-build-merger
Browse files

Merge "Calling setIsDrawerPresent(false) twice causes a crash." into nyc-dev am: bc5aa7a7 

am: a0bf76bb

* commit 'a0bf76bb':
  Calling setIsDrawerPresent(false) twice causes a crash.

Change-Id: I43d006aeedb29d3aca59b9ecf5fe1248e3bf8344
parents 99d21c78 a0bf76bb

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

+4 −2
Original line number Diff line number Diff line
@@ -155,10 +155,12 @@ public class SettingsDrawerActivity extends Activity { 
            mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);

            updateDrawer();

        } else {

            if (mDrawerLayout != null) {

                mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);

                mDrawerLayout = null;

            }

        }

    }



    public void openDrawer() {

        if (mDrawerLayout != null) {