diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-07-10 18:56:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 18:56:58 +0000 |
| commit | 3284ddf07f6e20745c009e14fa89c7a777c46fd9 (patch) | |
| tree | c1cbab12ad03427086a15d5591c18ef04e7e0997 | |
| parent | f9bab601a9940c2e582b63e8bddc8c8bf8ac1815 (diff) | |
| parent | b039f9dea4b8fbab2e1e1a7b9a5fa0e576bda730 (diff) | |
| download | android_packages_apps_ManagedProvisioning-3284ddf07f6e20745c009e14fa89c7a777c46fd9.tar.gz android_packages_apps_ManagedProvisioning-3284ddf07f6e20745c009e14fa89c7a777c46fd9.tar.bz2 android_packages_apps_ManagedProvisioning-3284ddf07f6e20745c009e14fa89c7a777c46fd9.zip | |
am b039f9de: Merge "call startActivityForResult on remove account intent" into mnc-dev
* commit 'b039f9dea4b8fbab2e1e1a7b9a5fa0e576bda730':
call startActivityForResult on remove account intent
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/managedprovisioning/Utils.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a3855bc6..aac12051 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -140,7 +140,7 @@ <activity android:name=".TrampolineActivity" - android:theme="@*android:style/Theme.NoDisplay" + android:theme="@android:style/Theme.NoDisplay" android:excludeFromRecents="true"> </activity> diff --git a/src/com/android/managedprovisioning/Utils.java b/src/com/android/managedprovisioning/Utils.java index e68b08e8..1d36278f 100644 --- a/src/com/android/managedprovisioning/Utils.java +++ b/src/com/android/managedprovisioning/Utils.java @@ -338,8 +338,7 @@ public class Utils { AccountManager.KEY_INTENT); if (removeIntent != null) { ProvisionLogger.logi("Starting activity to remove account"); - removeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(removeIntent); + TrampolineActivity.startActivity(context, removeIntent); } else { ProvisionLogger.logw("Could not remove account from the primary user."); } |