| commit | 2fc2eb49a955284a00853e0ba1d2ba8c78f9b2fa | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Fri Apr 29 16:35:28 2016 -0700 |
| committer | Philip P. Moltmann <moltmann@google.com> | Fri Apr 29 16:35:28 2016 -0700 |
| tree | ea86f155f566aa2ec4f8b343ba22ea401c0f0709 | |
| parent | 7dce005fabf15c3532db0540cdc2c67e59da7fb4 [diff] |
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
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();