Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: ef5285e3f6

am: 1a7aa2654f

* commit '1a7aa2654fba1368aa28074e667f7d4460bd3da5':
  Add nullcheck to StorageSettings.

Change-Id: Ied5f853f7e86aa9b7298ad9ef6c01410a2d0f217

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

@@ -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;