diff options
5 files changed, 50 insertions, 17 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 383b3321b1de..e20ea98af430 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9797,6 +9797,7 @@ package android.content { field public static final java.lang.String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED"; field public static final java.lang.String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED"; field public static final java.lang.String ACTION_EDIT = "android.intent.action.EDIT"; + field public static final deprecated java.lang.String ACTION_EPHEMERAL_RESOLVER_SETTINGS = "android.intent.action.EPHEMERAL_RESOLVER_SETTINGS"; field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE"; field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE"; field public static final java.lang.String ACTION_FACTORY_RESET = "android.intent.action.FACTORY_RESET"; @@ -9809,7 +9810,10 @@ 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 deprecated java.lang.String ACTION_INSTALL_EPHEMERAL_PACKAGE = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE"; + 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"; field public static final java.lang.String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION"; 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"; @@ -9868,6 +9872,8 @@ package android.content { field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK"; field public static final java.lang.String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW"; field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT"; + field public static final deprecated java.lang.String ACTION_RESOLVE_EPHEMERAL_PACKAGE = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE"; + field public static final java.lang.String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE"; field public static final java.lang.String ACTION_REVIEW_PERMISSIONS = "android.intent.action.REVIEW_PERMISSIONS"; field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN"; field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index da887af52b2a..81081f838f74 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1505,22 +1505,38 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_INSTALL_PACKAGE = "android.intent.action.INSTALL_PACKAGE"; /** - * Activity Action: Launch ephemeral installer. - * <p> - * Input: The data must be a http: URI that the ephemeral application is registered - * to handle. + * @hide + * @deprecated Do not use. This will go away. + * Replace with {@link #ACTION_INSTALL_INSTANT_APP_PACKAGE}. + */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_INSTALL_EPHEMERAL_PACKAGE + = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE"; + /** + * Activity Action: Launch instant application installer. * <p class="note"> * This is a protected intent that can only be sent by the system. * </p> * * @hide */ + @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_INSTALL_EPHEMERAL_PACKAGE - = "android.intent.action.INSTALL_EPHEMERAL_PACKAGE"; + public static final String ACTION_INSTALL_INSTANT_APP_PACKAGE + = "android.intent.action.INSTALL_INSTANT_APP_PACKAGE"; /** - * Service Action: Resolve ephemeral application. + * @hide + * @deprecated Do not use. This will go away. + * Replace with {@link #ACTION_RESOLVE_INSTANT_APP_PACKAGE}. + */ + @SystemApi + @SdkConstant(SdkConstantType.SERVICE_ACTION) + public static final String ACTION_RESOLVE_EPHEMERAL_PACKAGE + = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE"; + /** + * Service Action: Resolve instant application. * <p> * The system will have a persistent connection to this service. * This is a protected intent that can only be sent by the system. @@ -1528,12 +1544,22 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ + @SystemApi @SdkConstant(SdkConstantType.SERVICE_ACTION) - public static final String ACTION_RESOLVE_EPHEMERAL_PACKAGE - = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE"; + public static final String ACTION_RESOLVE_INSTANT_APP_PACKAGE + = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE"; /** - * Activity Action: Launch ephemeral settings. + * @hide + * @deprecated Do not use. This will go away. + * Replace with {@link #ACTION_INSTANT_APP_RESOLVER_SETTINGS}. + */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_EPHEMERAL_RESOLVER_SETTINGS + = "android.intent.action.EPHEMERAL_RESOLVER_SETTINGS"; + /** + * Activity Action: Launch instant app settings. * * <p class="note"> * This is a protected intent that can only be sent by the system. @@ -1541,9 +1567,10 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ + @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_EPHEMERAL_RESOLVER_SETTINGS - = "android.intent.action.EPHEMERAL_RESOLVER_SETTINGS"; + public static final String ACTION_INSTANT_APP_RESOLVER_SETTINGS + = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS"; /** * Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} to install a diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a493f33cfcb1..92a6484c4fe4 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6243,7 +6243,7 @@ public abstract class PackageManager { * Return the {@link ComponentName} of the activity providing Settings for the Instant App * resolver. * - * @see {@link android.content.intent#ACTION_EPHEMERAL_RESOLVER_SETTINGS} + * @see {@link android.content.intent#ACTION_INSTANT_APP_RESOLVER_SETTINGS} * @hide */ @SystemApi diff --git a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java index 0e13f974c0a7..f6e96b2bf876 100644 --- a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java +++ b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java @@ -66,7 +66,7 @@ final class EphemeralResolverConnection implements DeathRecipient { public EphemeralResolverConnection(Context context, ComponentName componentName) { mContext = context; - mIntent = new Intent(Intent.ACTION_RESOLVE_EPHEMERAL_PACKAGE).setComponent(componentName); + mIntent = new Intent(Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE).setComponent(componentName); } public final List<InstantAppResolveInfo> getInstantAppResolveInfoList(int hashPrefix[], diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index dec639f928ef..7da11e2a2978 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3056,7 +3056,7 @@ public class PackageManagerService extends IPackageManager.Stub { MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE | (!Build.IS_DEBUGGABLE ? MATCH_SYSTEM_ONLY : 0); - final Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_EPHEMERAL_PACKAGE); + final Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE); final List<ResolveInfo> resolvers = queryIntentServicesInternal(resolverIntent, null, resolveFlags, UserHandle.USER_SYSTEM, callingUid, false /*includeInstantApps*/); @@ -3098,7 +3098,7 @@ public class PackageManagerService extends IPackageManager.Stub { } private @Nullable ActivityInfo getEphemeralInstallerLPr() { - final Intent intent = new Intent(Intent.ACTION_INSTALL_EPHEMERAL_PACKAGE); + final Intent intent = new Intent(Intent.ACTION_INSTALL_INSTANT_APP_PACKAGE); intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE); @@ -3132,7 +3132,7 @@ public class PackageManagerService extends IPackageManager.Stub { private @Nullable ComponentName getEphemeralResolverSettingsLPr( @NonNull ComponentName resolver) { - final Intent intent = new Intent(Intent.ACTION_EPHEMERAL_RESOLVER_SETTINGS) + final Intent intent = new Intent(Intent.ACTION_INSTANT_APP_RESOLVER_SETTINGS) .addCategory(Intent.CATEGORY_DEFAULT) .setPackage(resolver.getPackageName()); final int resolveFlags = MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE; |