Merge "Move content later button doesn't work on Migration Wizard"

am: 1308b56908 Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
2018-10-12 14:07:25 -07:00
parent 6767ce9d24 1308b56908
commit d77dfa200e
1 changed files with 7 additions and 3 deletions
--- 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