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

am: 0c71d3b5cf

* commit '0c71d3b5cfbe14bb531ce3c94838ec84ef84d96b':
  Read disk ID from intent

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