Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Udam Saini
2016-03-29 19:42:42 +00:00
committed by Android (Google) Code Review
parent 75c21ca948 68dab67de2
commit bc5aa7a736
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
View File

@@ -155,8 +155,10 @@ public class SettingsDrawerActivity extends Activity {
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
updateDrawer(); updateDrawer();
} else { } else {
mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); if (mDrawerLayout != null) {
mDrawerLayout = null; mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
mDrawerLayout = null;
}
} }
} }