Gracefully finish when missing volume.

Bug: 21403958 Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
2015-06-16 16:46:03 -07:00
parent 8e987d9bfb
commit e79ff145f3
2 changed files with 12 additions and 2 deletions
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -90,7 +90,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
            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());