From 901934372894f8dcc6cd7aacafcd7607a4515845 Mon Sep 17 00:00:00 2001 From: Takamasa Kuramitsu Date: Mon, 1 Oct 2018 22:34:06 +0900 Subject: [PATCH] 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 --- .../deviceinfo/StorageWizardMigrateConfirm.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index b17defd0fc1..48ec0e313d0 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java @@ -85,9 +85,13 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { 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