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

Commit 81cecc50 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Renames EXTRA_REMOVED_BY_SYSTEM to EXTRA_USER_INITIATED"

parents 48363ed6 2cf9810d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10820,7 +10820,6 @@ package android.content { 
    field public static final String EXTRA_REFERRER = "android.intent.extra.REFERRER";

    field public static final String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";

    field public static final String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";

    field public static final String EXTRA_REMOVED_BY_SYSTEM = "android.intent.extra.REMOVED_BY_SYSTEM";

    field public static final String EXTRA_REPLACEMENT_EXTRAS = "android.intent.extra.REPLACEMENT_EXTRAS";

    field public static final String EXTRA_REPLACING = "android.intent.extra.REPLACING";

    field public static final String EXTRA_RESTRICTIONS_BUNDLE = "android.intent.extra.restrictions_bundle";
@@ -10846,6 +10845,7 @@ package android.content { 
    field public static final String EXTRA_UID = "android.intent.extra.UID";

    field public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";

    field public static final String EXTRA_USER = "android.intent.extra.USER";

    field public static final String EXTRA_USER_INITIATED = "android.intent.extra.USER_INITIATED";

    field public static final int FILL_IN_ACTION = 1; // 0x1

    field public static final int FILL_IN_CATEGORIES = 4; // 0x4

    field public static final int FILL_IN_CLIP_DATA = 128; // 0x80

core/java/android/content/Intent.java

+5 −7
Original line number Diff line number Diff line
@@ -619,7 +619,6 @@ import java.util.TimeZone; 
 *     <li> {@link #EXTRA_PHONE_NUMBER}

 *     <li> {@link #EXTRA_REFERRER}

 *     <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}

 *     <li> {@link #EXTRA_REMOVED_BY_SYSTEM}

 *     <li> {@link #EXTRA_REPLACING}

 *     <li> {@link #EXTRA_SHORTCUT_ICON}

 *     <li> {@link #EXTRA_SHORTCUT_ICON_RESOURCE}
@@ -631,6 +630,7 @@ import java.util.TimeZone; 
 *     <li> {@link #EXTRA_TEXT}

 *     <li> {@link #EXTRA_TITLE}

 *     <li> {@link #EXTRA_UID}

 *     <li> {@link #EXTRA_USER_INITIATED}

 * </ul>

 *

 * <h3>Flags</h3>
@@ -2461,8 +2461,8 @@ public class Intent implements Parcelable, Cloneable { 
     * application -- data and code -- is being removed.

     * <li> {@link #EXTRA_REPLACING} is set to true if this will be followed

     * by an {@link #ACTION_PACKAGE_ADDED} broadcast for the same package.

     * <li> {@link #EXTRA_REMOVED_BY_SYSTEM} containing boolean field to to signal that the

     * application was removed automatically without the user-initiated action.

     * <li> {@link #EXTRA_USER_INITIATED} containing boolean field to signal that the application

     * was removed with the user-initiated action.

     * </ul>

     *

     * <p class="note">This is a protected intent that can only be sent
@@ -5555,11 +5555,9 @@ public class Intent implements Parcelable, Cloneable { 


    /**

     * Used as a boolean extra field in {@link android.content.Intent#ACTION_PACKAGE_REMOVED}

     * intents to signal that the application was removed automatically without the user-initiated

     * action.

     * intents to signal that the application was removed with the user-initiated action.

     */

    public static final String EXTRA_REMOVED_BY_SYSTEM =

            "android.intent.extra.REMOVED_BY_SYSTEM";

    public static final String EXTRA_USER_INITIATED = "android.intent.extra.USER_INITIATED";



    /**

     * A String holding the phone number originally entered in

non-updatable-api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10820,7 +10820,6 @@ package android.content { 
    field public static final String EXTRA_REFERRER = "android.intent.extra.REFERRER";

    field public static final String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";

    field public static final String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";

    field public static final String EXTRA_REMOVED_BY_SYSTEM = "android.intent.extra.REMOVED_BY_SYSTEM";

    field public static final String EXTRA_REPLACEMENT_EXTRAS = "android.intent.extra.REPLACEMENT_EXTRAS";

    field public static final String EXTRA_REPLACING = "android.intent.extra.REPLACING";

    field public static final String EXTRA_RESTRICTIONS_BUNDLE = "android.intent.extra.restrictions_bundle";
@@ -10846,6 +10845,7 @@ package android.content { 
    field public static final String EXTRA_UID = "android.intent.extra.UID";

    field public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";

    field public static final String EXTRA_USER = "android.intent.extra.USER";

    field public static final String EXTRA_USER_INITIATED = "android.intent.extra.USER_INITIATED";

    field public static final int FILL_IN_ACTION = 1; // 0x1

    field public static final int FILL_IN_CATEGORIES = 4; // 0x4

    field public static final int FILL_IN_CLIP_DATA = 128; // 0x80

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

+1 −1
Original line number Diff line number Diff line
@@ -19209,7 +19209,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            extras.putInt(Intent.EXTRA_UID, removedUid);

            extras.putBoolean(Intent.EXTRA_DATA_REMOVED, dataRemoved);

            extras.putBoolean(Intent.EXTRA_DONT_KILL_APP, !killApp);

            extras.putBoolean(Intent.EXTRA_REMOVED_BY_SYSTEM, removedBySystem);

            extras.putBoolean(Intent.EXTRA_USER_INITIATED, !removedBySystem);

            if (isUpdate || isRemovedPackageSystemUpdate) {

                extras.putBoolean(Intent.EXTRA_REPLACING, true);

            }