commit e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f
author Philip P. Moltmann <moltmann@google.com> Mon May 02 23:00:30 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 23:00:30 2016 +0000
tree 9e2461053307fc35d71c4c381bae13dc4722033a
parent 57e6a9144a0577308bd9888f3498c17ca96e4f5f
parent 2fc2eb49a955284a00853e0ba1d2ba8c78f9b2fa

Merge "Read disk ID from intent" into nyc-dev

src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java

diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 7b98dc2..a102eda 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -85,7 +85,8 @@
 
             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();