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

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

Merge "Allow applications to define failure handlers" into oc-mr1-dev

parents 09ba6909 d0084f75

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9370,6 +9370,7 @@ package android.content { 
    field public static final java.lang.String ACTION_INPUT_METHOD_CHANGED = "android.intent.action.INPUT_METHOD_CHANGED";

    field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";

    field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";

    field public static final java.lang.String ACTION_INSTALL_FAILURE = "android.intent.action.INSTALL_FAILURE";

    field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";

    field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";

    field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";
@@ -9552,6 +9553,7 @@ package android.content { 
    field public static final deprecated java.lang.String EXTRA_SHORTCUT_INTENT = "android.intent.extra.shortcut.INTENT";

    field public static final deprecated java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";

    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";

    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9908,6 +9908,7 @@ package android.content { 
    field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";

    field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";

    field public static final deprecated java.lang.String ACTION_INSTALL_EPHEMERAL_PACKAGE = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE";

    field public static final java.lang.String ACTION_INSTALL_FAILURE = "android.intent.action.INSTALL_FAILURE";

    field public static final java.lang.String ACTION_INSTALL_INSTANT_APP_PACKAGE = "android.intent.action.INSTALL_INSTANT_APP_PACKAGE";

    field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";

    field public static final java.lang.String ACTION_INSTANT_APP_RESOLVER_SETTINGS = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS";

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9405,6 +9405,7 @@ package android.content { 
    field public static final java.lang.String ACTION_INPUT_METHOD_CHANGED = "android.intent.action.INPUT_METHOD_CHANGED";

    field public static final java.lang.String ACTION_INSERT = "android.intent.action.INSERT";

    field public static final java.lang.String ACTION_INSERT_OR_EDIT = "android.intent.action.INSERT_OR_EDIT";

    field public static final java.lang.String ACTION_INSTALL_FAILURE = "android.intent.action.INSTALL_FAILURE";

    field public static final java.lang.String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";

    field public static final java.lang.String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";

    field public static final java.lang.String ACTION_LOCKED_BOOT_COMPLETED = "android.intent.action.LOCKED_BOOT_COMPLETED";
@@ -9587,6 +9588,7 @@ package android.content { 
    field public static final deprecated java.lang.String EXTRA_SHORTCUT_INTENT = "android.intent.extra.shortcut.INTENT";

    field public static final deprecated java.lang.String EXTRA_SHORTCUT_NAME = "android.intent.extra.shortcut.NAME";

    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";

    field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

core/java/android/content/Intent.java

+16 −2
Original line number Diff line number Diff line
@@ -1534,6 +1534,22 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";



    /**

     * Activity Action: Activity to handle split installation failures.

     * <p>Splits may be installed dynamically. This happens when an Activity is launched,

     * but the split that contains the application isn't installed. When a split is

     * installed in this manner, the containing package usually doesn't know this is

     * happening. However, if an error occurs during installation, the containing

     * package can define a single activity handling this action to deal with such

     * failures.

     * <p>The activity handling this action must be in the base package.

     * <p>

     * Input: {@link #EXTRA_INTENT} the original intent that started split installation.

     * {@link #EXTRA_SPLIT_NAME} the name of the split that failed to be installed.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_INSTALL_FAILURE = "android.intent.action.INSTALL_FAILURE";



    /**

     * @hide

     * @deprecated Do not use. This will go away.
@@ -1823,9 +1839,7 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Type: String

     * </p>

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";



    /**

core/java/android/content/pm/AuxiliaryResolveInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content.pm; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Intent;

import android.content.IntentFilter;
@@ -35,6 +36,8 @@ public final class AuxiliaryResolveInfo extends IntentFilter { 
    public final InstantAppResolveInfo resolveInfo;

    /** The resolved package. Copied from {@link #resolveInfo}. */

    public final String packageName;

    /** The activity to launch if there's an installation failure. */

    public final ComponentName installFailureActivity;

    /** The resolve split. Copied from the matched filter in {@link #resolveInfo}. */

    public final String splitName;

    /** Whether or not instant resolution needs the second phase */
@@ -61,15 +64,18 @@ public final class AuxiliaryResolveInfo extends IntentFilter { 
        this.needsPhaseTwo = needsPhase2;

        this.versionCode = resolveInfo.getVersionCode();

        this.failureIntent = failureIntent;

        this.installFailureActivity = null;

    }



    /** Create a response for installing a split on demand. */

    public AuxiliaryResolveInfo(@NonNull String packageName,

            @Nullable String splitName,

            @Nullable ComponentName failureActivity,

            int versionCode,

            @Nullable Intent failureIntent) {

        super();

        this.packageName = packageName;

        this.installFailureActivity = failureActivity;

        this.splitName = splitName;

        this.versionCode = versionCode;

        this.resolveInfo = null;