From f7db2b2f228f6d350109c140649ed44ae04f1cc3 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sun, 19 Apr 2015 14:59:04 -0700
Subject: [PATCH] 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
---
 src/com/android/settings/deviceinfo/StorageWizardBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 4cb48c55f1a..42c74a5e326 100644
--- 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);