From 7317e8abcc1d691b77386b9ff5852360dc40cdd4 Mon Sep 17 00:00:00 2001 From: Hakan Seyalioglu Date: Mon, 12 Dec 2016 16:15:38 -0800 Subject: [PATCH] Don't auto-launch if switching to managed account When the user picks the option to switch to a managed account, avoid auto-launching the activity if there's only a single activity to pick from. Bug: 32669623 Test: Manual Change-Id: Ieaed5885385929297304506ca2d5839e77043a64 --- core/java/com/android/internal/app/ChooserActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index d8f7907524ee5..5a134b2fa213b 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -299,6 +299,11 @@ public class ChooserActivity extends ResolverActivity { || aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE)) { result = Intent.createChooser(result, getIntent().getCharSequenceExtra(Intent.EXTRA_TITLE)); + + // Don't auto-launch single intents if the intent is being forwarded. This is done + // because automatically launching a resolving application as a response to the user + // action of switching accounts is pretty unexpected. + result.putExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE, false); } return result; }