Merge "Forward EXTRA_FORCE_PROVISION to the carrier app" into oc-mr1-dev
diff --git a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
index e774720..ae06037 100644
--- a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
@@ -89,24 +89,26 @@
protected Intent getEuiccUiIntent() {
String action = getIntent().getAction();
- String euiccUiAction;
+ Intent intent = new Intent();
switch (action) {
case EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS:
- euiccUiAction = EuiccService.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS;
+ intent.setAction(EuiccService.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
break;
case EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION:
if (isDeviceProvisioned()) {
Log.w(TAG, "Cannot perform eUICC provisioning once device is provisioned");
return null;
}
- euiccUiAction = EuiccService.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION;
- break;
+ intent.setAction(EuiccService.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION);
+ intent.putExtra(
+ EuiccManager.EXTRA_FORCE_PROVISION,
+ getIntent().getBooleanExtra(EuiccManager.EXTRA_FORCE_PROVISION, false));
default:
Log.w(TAG, "Unsupported action: " + action);
return null;
}
- return new Intent(euiccUiAction);
+ return intent;
}
@VisibleForTesting