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

am: ef5285e3f6

* commit 'ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
  Add nullcheck to StorageSettings.

Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47

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;