commit ec01e260fbf88ce7b6d3d278da28a6614b1f8a2b
author Takamasa Kuramitsu <takamasa.kuramitsu@sony.com> Fri Oct 12 14:21:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 12 14:21:52 2018 -0700
tree 686dd746c44d318c2232081210843e58afc76cc8
parent 2559f02d68432f6be7c40f351ffaf7a040c604ba
parent 7cb8223ce204f6ceac46de27c6c29244ef0ed95e

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

Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d

src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java

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