aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2015-03-13 09:25:48 -0700
committerRaj Yengisetty <rajesh@cyngn.com>2015-03-17 09:07:21 -0700
commit05ddc9cd818b41b8673b848b2a48982f48738277 (patch)
treeec98f957477cd9925c0fbb40ccb68f3f2d4fd575
parent9cc59b6ac5ac3d6531ebf477b359b7b49342d478 (diff)
downloadandroid_packages_apps_CMFileManager-05ddc9cd818b41b8673b848b2a48982f48738277.tar.gz
android_packages_apps_CMFileManager-05ddc9cd818b41b8673b848b2a48982f48738277.tar.bz2
android_packages_apps_CMFileManager-05ddc9cd818b41b8673b848b2a48982f48738277.zip
CMFileManager: protect code path for access mSdBookmarks
FATAL EXCEPTION: main AndroidRuntime: Process: com.cyanogenmod.filemanager, PID: 2587 AndroidRuntime: java.lang.NullPointerException: Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference AndroidRuntime: at com.cyanogenmod.filemanager.activities.NavigationActivity.applyInitialDir(NavigationActivity.java:1626) AndroidRuntime: at com.cyanogenmod.filemanager.activities.NavigationActivity$15.run(NavigationActivity.java:1521) AndroidRuntime: at android.os.Handler.handleCallback(Handler.java:739) Change-Id: I2aec4fd6a5b8fcd31cd128f8f46cc9f88bca191e
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index b4bb0b65..23bd34bf 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1624,10 +1624,12 @@ public class NavigationActivity extends Activity
}
boolean needsEasyMode = false;
- for (Bookmark bookmark :mSdBookmarks) {
- if (bookmark.mPath.equalsIgnoreCase(initialDir)) {
- needsEasyMode = true;
- break;
+ if (mSdBookmarks != null ) {
+ for (Bookmark bookmark :mSdBookmarks) {
+ if (bookmark.mPath.equalsIgnoreCase(initialDir)) {
+ needsEasyMode = true;
+ break;
+ }
}
}