From 2fc2eb49a955284a00853e0ba1d2ba8c78f9b2fa Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 29 Apr 2016 16:35:28 -0700
Subject: [PATCH] Read disk ID from intent

mDisk might be null, but we can recover the disk ID from the original
Intent.

Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
---
 .../settings/deviceinfo/StorageWizardMigrateConfirm.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 7b98dc252ad..a102eda775e 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -85,7 +85,8 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
 
             if (Objects.equals(mVolume.getFsUuid(), sm.getPrimaryStorageVolume().getUuid())) {
                 final Intent intent = new Intent(this, StorageWizardReady.class);
-                intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());
+                intent.putExtra(DiskInfo.EXTRA_DISK_ID,
+                        getIntent().getStringExtra(DiskInfo.EXTRA_DISK_ID));
                 startActivity(intent);
                 finishAffinity();