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

Commit ae15e11d authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Deprecate Intent based installation/uninstallation"

parents 60678a07 fe460100

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9985,7 +9985,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 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 deprecated 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";

    field public static final java.lang.String ACTION_MAIN = "android.intent.action.MAIN";
@@ -10058,7 +10058,7 @@ package android.content { 
    field public static final java.lang.String ACTION_UID_REMOVED = "android.intent.action.UID_REMOVED";

    field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";

    field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";

    field public static final java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";

    field public static final deprecated java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";

    field public static final java.lang.String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";

    field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";

    field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";

core/java/android/content/Intent.java

+7 −0
Original line number Diff line number Diff line
@@ -1538,7 +1538,10 @@ public class Intent implements Parcelable, Cloneable { 
     * @see #EXTRA_INSTALLER_PACKAGE_NAME

     * @see #EXTRA_NOT_UNKNOWN_SOURCE

     * @see #EXTRA_RETURN_RESULT

     *

     * @deprecated use {@link android.content.pm.PackageInstaller} instead

     */

    @Deprecated

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE";
@@ -1707,7 +1710,11 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Requires {@link android.Manifest.permission#REQUEST_DELETE_PACKAGES}

     * since {@link Build.VERSION_CODES#P}.

     *

     * @deprecated Use {@link android.content.pm.PackageInstaller#uninstall(String, IntentSender)}

     *             instead

     */

    @Deprecated

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ public class InstallStart extends Activity { 


            if (packageUri != null && (packageUri.getScheme().equals(ContentResolver.SCHEME_FILE)

                    || packageUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))) {

                // [IMPORTANT] This path is deprecated, but should still work. Only necessary

                // features should be added.



                // Copy file to prevent it from being changed underneath this process

                nextActivity.setClass(this, InstallStaging.class);

            } else if (packageUri != null && packageUri.getScheme().equals(