Merge "Read disk ID from intent" into nyc-dev am: e0e7fa4501

am: fe99c4282e

* commit 'fe99c4282e8e8a057c9519b93640c09ffe8e628a':
  Read disk ID from intent

Change-Id: Ifb0d8f693059943f78e07ff90bec8b355998b23e
This commit is contained in:
Philip P. Moltmann
2016-05-02 23:29:45 +00:00
committed by android-build-merger

View File

@@ -85,7 +85,8 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
if (Objects.equals(mVolume.getFsUuid(), sm.getPrimaryStorageVolume().getUuid())) { if (Objects.equals(mVolume.getFsUuid(), sm.getPrimaryStorageVolume().getUuid())) {
final Intent intent = new Intent(this, StorageWizardReady.class); 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); startActivity(intent);
finishAffinity(); finishAffinity();