aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiogo Ferreira <diogo@underdev.org>2016-02-02 14:58:56 +0000
committerMartin Brabham <optedoblivion@cyngn.com>2016-02-04 09:35:35 -0800
commitaa06d7e220885cc1cc183ea6cc935c0144780fc2 (patch)
treeca65dee56f576acaa846a49f221f31b58e3d1ef5
parentb73f0c1cc6c61ff430ec2de9ce81029bb7bb4d41 (diff)
downloadandroid_packages_apps_CMFileManager-aa06d7e220885cc1cc183ea6cc935c0144780fc2.tar.gz
android_packages_apps_CMFileManager-aa06d7e220885cc1cc183ea6cc935c0144780fc2.tar.bz2
android_packages_apps_CMFileManager-aa06d7e220885cc1cc183ea6cc935c0144780fc2.zip
fm: Don't crash on rotations when asking for permissions
When asking for permissions, rotating the device would cause the app to crash because configuration changes try to update a not yet initialized layout. Fix this by preventing layout updates on configuration changes if permissions are not yet granted. Change-Id: I0cdb23df1c07720f70543e7acac5e7b055aa534c Ticket: CYNGNOS-1678
-rwxr-xr-xsrc/com/cyanogenmod/filemanager/activities/NavigationActivity.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 650dbef8..5c07fe88 100755
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -792,9 +792,11 @@ public class NavigationActivity extends Activity
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
- onLayoutChanged();
- if (mDrawerToggle != null ) {
- mDrawerToggle.onConfigurationChanged(newConfig);
+ if (hasPermissions()) {
+ onLayoutChanged();
+ if (mDrawerToggle != null ) {
+ mDrawerToggle.onConfigurationChanged(newConfig);
+ }
}
}