Move content later button doesn't work on Migration Wizard
"Move content later" button doesn't work on StorageWizardMigrateConfirm
screen which is shown when end-user try to migrate data from adopted
SD Card to internal storage.
The cause is "Move content later" button triggers to StorageWizardReady
screen but cannot launch because the mDisk is null when the destination
of migration is internal storage.
This CL fixes to just exit StorageWizardMigrateConfirm screen when mDisk
is null.
Bug: 117082495
Test: manual
Change-Id: Iccdccf4dda126d77458b9db35e4ec6ae6a263cb7
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index b17defd..48ec0e3 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -85,9 +85,13 @@
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_MIGRATE_LATER);
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(EXTRA_MIGRATE_SKIP, true);
- startActivity(intent);
+ if (mDisk != null) {
+ final Intent intent = new Intent(this, StorageWizardReady.class);
+ intent.putExtra(EXTRA_MIGRATE_SKIP, true);
+ startActivity(intent);
+ } else {
+ finishAffinity();
+ }
}
@Override