diff options
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 26 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/public-staging.xml | 1 |
4 files changed, 41 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index ce618ce3dc8d..317d46ea1b84 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -851,6 +851,7 @@ package android { field public static final int indicatorRight = 16843022; // 0x101010e field public static final int indicatorStart = 16843729; // 0x10103d1 field public static final int inflatedId = 16842995; // 0x10100f3 + field public static final int inheritKeyStoreKeys; field public static final int inheritShowWhenLocked = 16844188; // 0x101059c field public static final int initOrder = 16842778; // 0x101001a field public static final int initialKeyguardLayout = 16843714; // 0x10103c2 @@ -10437,11 +10438,13 @@ package android.content { field public static final String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY"; field public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID"; field public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES"; + field public static final String EXTRA_NEW_UID = "android.intent.extra.NEW_UID"; field public static final String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE"; field public static final String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI"; field public static final String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME"; field public static final String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME"; field public static final String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER"; + field public static final String EXTRA_PREVIOUS_UID = "android.intent.extra.PREVIOUS_UID"; field public static final String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT"; field public static final String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY"; field public static final String EXTRA_QUICK_VIEW_FEATURES = "android.intent.extra.QUICK_VIEW_FEATURES"; @@ -10473,6 +10476,7 @@ package android.content { field public static final String EXTRA_TIMEZONE = "time-zone"; 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_UID_CHANGING = "android.intent.extra.UID_CHANGING"; 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 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index a50ff3841da9..2c207bc90444 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5987,6 +5987,22 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_UID = "android.intent.extra.UID"; /** + * Used as an optional int extra field in {@link android.content.Intent#ACTION_PACKAGE_ADDED} + * intents to supply the previous uid the package had been assigned. + * This would only be set when a package is leaving sharedUserId in an upgrade, or when a + * system app upgrade that had left sharedUserId is getting uninstalled. + */ + public static final String EXTRA_PREVIOUS_UID = "android.intent.extra.PREVIOUS_UID"; + + /** + * Used as an optional int extra field in {@link android.content.Intent#ACTION_PACKAGE_REMOVED} + * intents to supply the new uid the package will be assigned. + * This would only be set when a package is leaving sharedUserId in an upgrade, or when a + * system app upgrade that had left sharedUserId is getting uninstalled. + */ + public static final String EXTRA_NEW_UID = "android.intent.extra.NEW_UID"; + + /** * @hide String array of package names. */ @SystemApi @@ -6018,6 +6034,16 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_REPLACING = "android.intent.extra.REPLACING"; /** + * Used as a boolean extra field in {@link android.content.Intent#ACTION_PACKAGE_REMOVED}, + * {@link android.content.Intent#ACTION_UID_REMOVED}, and + * {@link android.content.Intent#ACTION_PACKAGE_ADDED} + * intents to indicate that this package is changing its UID. + * This would only be set when a package is leaving sharedUserId in an upgrade, or when a + * system app upgrade that had left sharedUserId is getting uninstalled. + */ + public static final String EXTRA_UID_CHANGING = "android.intent.extra.UID_CHANGING"; + + /** * Used as an int extra field in {@link android.app.AlarmManager} pending intents * to tell the application being invoked how many pending alarms are being * delivered with the intent. For one-shot alarms this will always be 1. diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 7562b9aa0ead..579ef512e671 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -401,6 +401,15 @@ and before. --> <attr name="sharedUserMaxSdkVersion" format="integer" /> + <!-- Whether the application should inherit all AndroidKeyStore keys of its shared user + group in the case of leaving its shared user ID in an upgrade. If set to false, all + AndroidKeyStore keys will remain in the shared user group, and the application will no + longer have access to those keys after the upgrade. If set to true, all AndroidKeyStore + keys owned by the shared user group will be transferred to the upgraded application; + other applications in the shared user group will no longer have access to those keys + after the migration. The default value is false if not explicitly set. --> + <attr name="inheritKeyStoreKeys" format="boolean" /> + <!-- Internal version code. This is the number used to determine whether one version is more recent than another: it has no other meaning than that higher numbers are more recent. You could use this number to @@ -1695,6 +1704,7 @@ <attr name="sharedUserId" /> <attr name="sharedUserLabel" /> <attr name="sharedUserMaxSdkVersion" /> + <attr name="inheritKeyStoreKeys" /> <attr name="installLocation" /> <attr name="isolatedSplits" /> <attr name="isFeatureSplit" /> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index ffcadd06899d..0756911c6aa9 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -128,6 +128,7 @@ <public name="localeConfig" /> <public name="showBackground" /> <public name="useTargetActivityForQuickAccess"/> + <public name="inheritKeyStoreKeys" /> <public name="preferKeepClear" /> <public name="autoHandwritingEnabled" /> <public name="fromExtendLeft" /> |