From 4d4142b6aad3da4c1757b56a78a9196b45a7982c Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Tue, 24 Jan 2017 09:29:38 -0800 Subject: [PATCH] Fix a bug where Settings would crash from search into storage. If the user entered the StorageDashboardFragment from search, it would crash due to a precondition check added to the Storage Manager. Because no volume id was set in the bundle for it to check, it hits an assert that the volume id is not null causing Settings to crash. This sets a sensible default instead of null. Bug: 34633464 Test: Manual. Entering through search does not crash now. Change-Id: Ia6cd82929a0813eefcdad279436b9c2fe30b0146 --- .../settings/deviceinfo/StorageDashboardFragment.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index d05d08807a1..8fabd8d3472 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -21,9 +21,6 @@ import android.os.Bundle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.SearchIndexableResource; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -62,7 +59,8 @@ public class StorageDashboardFragment extends DashboardFragment { // Initialize the storage sizes that we can quickly calc. StorageManager sm = context.getSystemService(StorageManager.class); - String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID); + String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID, + VolumeInfo.ID_PRIVATE_INTERNAL); mVolume = sm.findVolumeById(volumeId); if (!isVolumeValid()) { getActivity().finish();