Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e

am: 7cb8223ce2 Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d
2018-10-12 14:21:52 -07:00
parent 2559f02d68 7cb8223ce2
commit ec01e260fb
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);

+        if (mDisk != null) {
            final Intent intent = new Intent(this, StorageWizardReady.class);
            intent.putExtra(EXTRA_MIGRATE_SKIP, true);
            startActivity(intent);
+        } else {
+            finishAffinity();
+        }
    }

    @Override