Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcbbb428 authored by Hakan Seyalioglu's avatar Hakan Seyalioglu Committed by Android (Google) Code Review
Browse files

Merge "Don't auto-launch if switching to managed account"

parents a629c956 7317e8ab
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -299,6 +299,11 @@ public class ChooserActivity extends ResolverActivity {
                || aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE)) {
                || aInfo.name.equals(IntentForwarderActivity.FORWARD_INTENT_TO_MANAGED_PROFILE)) {
            result = Intent.createChooser(result,
            result = Intent.createChooser(result,
                    getIntent().getCharSequenceExtra(Intent.EXTRA_TITLE));
                    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;
        return result;
    }
    }