commit f322f66362b9e1622ff2dbc698d4b2d13449c533
author Jeff Sharkey <jsharkey@android.com> Wed Jun 17 00:20:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 17 00:20:02 2015 +0000
tree d32dbe0bc8db8775fee5e9d44bfd81a8841e08ad
parent 8453e361881f0d16e9fae88ca837fbcb0138c3f3
parent 122b4d735f2f83ead436f4d6067ad1718c701004

am 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev

* commit '122b4d735f2f83ead436f4d6067ad1718c701004':
  Gracefully finish when missing volume.

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());