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

am: 6a2c269a4c

* commit '6a2c269a4c53e51ad72f96b8ecc64c91048e1acc':
  Read disk ID from intent

Change-Id: Id9c13a8dc72c11601d3309a28c4cd54a30494fff
This commit is contained in:
Philip P. Moltmann
2016-05-02 23:35:46 +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();