commit e79ff145f3da966262d050898125c51f4bdc75e4
author Jeff Sharkey <jsharkey@android.com> Tue Jun 16 16:46:03 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Jun 16 16:46:03 2015 -0700
tree c279dc9d50bb5bb6f8fe24d38395d612d7f8ed7c
parent 8e987d9bfb9c69daf306c52d84d8ea480eb4d73a

Gracefully finish when missing volume.

Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655

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

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 799121b..b7a42c3 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -127,7 +127,12 @@
         mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
         mVolume = mStorageManager.findVolumeById(mVolumeId);
 
-        Preconditions.checkNotNull(mVolume);
+        if (mVolume == null) {
+            Log.d(TAG, "Leaving details fragment due to missing volume");
+            finish();
+            return;
+        }
+
         Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
 
         addPreferencesFromResource(R.xml.device_info_storage_volume);

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

diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index 08117ba..8e912eb 100644
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -90,7 +90,12 @@
             mVolume = mStorageManager.findVolumeById(volId);
         }
 
-        Preconditions.checkNotNull(mVolume);
+        if (mVolume == null) {
+            Log.d(TAG, "Leaving details fragment due to missing volume");
+            finish();
+            return;
+        }
+
         Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);
 
         mDisk = mStorageManager.findDiskById(mVolume.getDiskId());