commit 0e048a11c7a9567cf77fbef481a564833359369f
author Daichi Hirono <hirono@google.com> Wed Apr 20 00:04:11 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 20 00:04:11 2016 +0000
tree f9e798b20ee42c17d14e3a7f8589930a5ae15826
parent ed74511cb170f499e3c776208471b9ff3fbc762b
parent 3ae25fb520d9b3a244c2cbb8103fffa4663a2b5f

Merge "Add nullcheck to StorageSettings." into nyc-dev

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;