From 2cf9810d0ff315578ebfbe68a76e599f71a14f6b Mon Sep 17 00:00:00 2001 From: Rhed Jao Date: Fri, 16 Oct 2020 13:35:35 +0800 Subject: [PATCH] Renames EXTRA_REMOVED_BY_SYSTEM to EXTRA_USER_INITIATED Bug: 170705231 Test: atest CtsAppSecurityHostTestCases:EphemeralTest Change-Id: Icac72129ca595a95101177b5788e18dedc7fba17 --- api/current.txt | 2 +- core/java/android/content/Intent.java | 12 +++++------- non-updatable-api/current.txt | 2 +- .../com/android/server/pm/PackageManagerService.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/current.txt b/api/current.txt index e2adbc440aceb..314a451597309 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10810,7 +10810,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"; @@ -10835,6 +10834,7 @@ package android.content { field public static final String EXTRA_TITLE = "android.intent.extra.TITLE"; field public static final String EXTRA_UID = "android.intent.extra.UID"; 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 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 2f1254f90ccf6..2316cdefdc4cb 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -620,7 +620,6 @@ import java.util.TimeZone; *
  • {@link #EXTRA_PHONE_NUMBER} *
  • {@link #EXTRA_REFERRER} *
  • {@link #EXTRA_REMOTE_INTENT_TOKEN} - *
  • {@link #EXTRA_REMOVED_BY_SYSTEM} *
  • {@link #EXTRA_REPLACING} *
  • {@link #EXTRA_SHORTCUT_ICON} *
  • {@link #EXTRA_SHORTCUT_ICON_RESOURCE} @@ -632,6 +631,7 @@ import java.util.TimeZone; *
  • {@link #EXTRA_TEXT} *
  • {@link #EXTRA_TITLE} *
  • {@link #EXTRA_UID} + *
  • {@link #EXTRA_USER_INITIATED} * * *

    Flags

    @@ -2465,8 +2465,8 @@ public class Intent implements Parcelable, Cloneable { * application -- data and code -- is being removed. *
  • {@link #EXTRA_REPLACING} is set to true if this will be followed * by an {@link #ACTION_PACKAGE_ADDED} broadcast for the same package. - *
  • {@link #EXTRA_REMOVED_BY_SYSTEM} containing boolean field to to signal that the - * application was removed automatically without the user-initiated action. + *
  • {@link #EXTRA_USER_INITIATED} containing boolean field to signal that the application + * was removed with the user-initiated action. * * *

    This is a protected intent that can only be sent @@ -5561,11 +5561,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 diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 8596f87498b17..029be756068b4 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -10810,7 +10810,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"; @@ -10835,6 +10834,7 @@ package android.content { field public static final String EXTRA_TITLE = "android.intent.extra.TITLE"; field public static final String EXTRA_UID = "android.intent.extra.UID"; 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 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 805fbbc75a878..47126e1837775 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -19029,7 +19029,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); }