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

Commit 7780e80d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sends resolving action to Instant App installer"

parents 5fe8eee6 b4165d72

core/java/android/content/Intent.java

+6 −0
Original line number Diff line number Diff line
@@ -4454,6 +4454,12 @@ public class Intent implements Parcelable, Cloneable { 
     */

    public static final String EXTRA_EPHEMERAL_TOKEN = "android.intent.extra.EPHEMERAL_TOKEN";



    /**

     * The action that triggered an instant application resolution.

     * @hide

     */

    public static final String EXTRA_INSTANT_APP_ACTION = "android.intent.extra.INSTANT_APP_ACTION";



    /**

     * The version code of the app to install components from.

     * @hide

services/core/java/com/android/server/pm/InstantAppResolver.java

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ public abstract class InstantAppResolver { 
        if (origIntent.getData() != null) {

            intent.putExtra(Intent.EXTRA_EPHEMERAL_HOSTNAME, origIntent.getData().getHost());

        }

        intent.putExtra(Intent.EXTRA_INSTANT_APP_ACTION, origIntent.getAction());



        // We have all of the data we need; just start the installer without a second phase

        if (!needsPhaseTwo) {