commit 3ae25fb520d9b3a244c2cbb8103fffa4663a2b5f
author Daichi Hirono <hirono@google.com> Tue Apr 19 19:39:42 2016 +0900
committer Daichi Hirono <hirono@google.com> Tue Apr 19 19:39:42 2016 +0900
tree 4a8c6654d660ac6c27f305de03a6b87ae29e86ee
parent 39975a60cc0953da058bbfa33c16007f763f5498

Add nullcheck to StorageSettings.

Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes: 28255655

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

diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 9774db9..902ca07 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -248,6 +248,10 @@
             // 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;