From d53a895675b4a027e94953cf0b23a14917b12b88 Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Thu, 26 May 2016 09:10:52 -0700 Subject: Fix crash when rotate to landscape without grant permission NavigationView is null before permission is granted. Guard with a null checking before refreshing FEIJ-820 Change-Id: Ib778ec82ce49dbcad8e45a5d54a5501cd3030410 (cherry picked from commit 1f473102a4b614f43f1febcdca5c37e84d136662) --- src/com/cyanogenmod/filemanager/activities/NavigationActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java index fbd2509d..bfdf0937 100755 --- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java @@ -802,7 +802,10 @@ public class NavigationActivity extends Activity if (mActiveDialog != null && mOnConfigChangeListener != null) { mOnConfigChangeListener.onConfigurationChanged(newConfig); } - getCurrentNavigationView().refreshViewMode(); + NavigationView navView = getCurrentNavigationView(); + if (navView != null) { + navView.refreshViewMode(); + } } /** -- cgit v1.2.3