commit 61c5a296e6e55a100179583c5769e0326a6fe3be
author Brad Ebinger <breadley@google.com> Fri Oct 12 22:46:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 22:46:21 2018 +0000
tree 983cda13d20fbd9ee4a8d09b3bfc3eb94ed0982c
parent 1308b5690896513c2d4d6c1b7b58f7093aaf3603
parent c888e19c87fcc924585a7d5c757bc16a6f32551b

Merge "RadioInfo: Disable ims provisioning switches in USER-build"

Android.mk

diff --git a/Android.mk b/Android.mk
index 0466a1f..b54b376 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,6 @@
     androidx.legacy_legacy-preference-v14 \
 
 LOCAL_JAVA_LIBRARIES := \
-    bouncycastle \
     telephony-common \
     ims-common
 

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