Use disk directly from volume in storage wizard.

Otherwise we're upset moving apps back to internal storage, which
is a private volume without a disk.

Bug: 19993667
Change-Id: I59e78bf13e14a68b0f4f1c6cbee35f6f7fd8d6ca

diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 4cb48c5..42c74a5 100644 (file)
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -57,7 +57,7 @@ public abstract class StorageWizardBase extends Activity implements NavigationBa
         if (!TextUtils.isEmpty(diskId)) {
             mDisk = mStorage.findDiskById(diskId);
         } else {
-            mDisk = mStorage.findDiskById(mVolume.getDiskId());
+            mDisk = mVolume.getDisk();
         }
 
         setTheme(R.style.SuwThemeMaterial_Light);