OSDN Git Service

Add nullcheck to StorageSettings.
authorDaichi Hirono <hirono@google.com>
Tue, 19 Apr 2016 10:39:42 +0000 (19:39 +0900)
committerDaichi Hirono <hirono@google.com>
Tue, 19 Apr 2016 10:39:42 +0000 (19:39 +0900)
Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes: 28255655

src/com/android/settings/deviceinfo/StorageSettings.java

index 9774db9..902ca07 100644 (file)
@@ -248,6 +248,10 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
             // Picked a normal volume
             final VolumeInfo vol = mStorageManager.findVolumeById(key);
 
+            if (vol == null) {
+                return false;
+            }
+
             if (vol.getState() == VolumeInfo.STATE_UNMOUNTED) {
                 VolumeUnmountedFragment.show(this, vol.getId());
                 return true;