diff options
| -rw-r--r-- | core/api/current.txt | 46 | ||||
| -rw-r--r-- | core/api/system-current.txt | 14 | ||||
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 196 | ||||
| -rw-r--r-- | test-mock/api/current.txt | 1 |
5 files changed, 131 insertions, 128 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 21611860047b..4b7e706064f2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12448,7 +12448,7 @@ package android.content.pm { method @Nullable public abstract android.graphics.drawable.Drawable getActivityBanner(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.graphics.drawable.Drawable getActivityIcon(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.graphics.drawable.Drawable getActivityIcon(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract android.graphics.drawable.Drawable getActivityLogo(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract android.graphics.drawable.Drawable getActivityLogo(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException; @@ -12458,7 +12458,7 @@ package android.content.pm { method public abstract int getApplicationEnabledSetting(@NonNull String); method @NonNull public abstract android.graphics.drawable.Drawable getApplicationIcon(@NonNull android.content.pm.ApplicationInfo); method @NonNull public abstract android.graphics.drawable.Drawable getApplicationIcon(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, @NonNull android.content.pm.PackageManager.ApplicationInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract CharSequence getApplicationLabel(@NonNull android.content.pm.ApplicationInfo); method @Nullable public abstract android.graphics.drawable.Drawable getApplicationLogo(@NonNull android.content.pm.ApplicationInfo); @@ -12470,10 +12470,10 @@ package android.content.pm { method @Nullable public abstract android.graphics.drawable.Drawable getDrawable(@NonNull String, @DrawableRes int, @Nullable android.content.pm.ApplicationInfo); method public void getGroupOfPlatformPermission(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.String>); method @NonNull public android.content.pm.InstallSourceInfo getInstallSourceInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int); + method @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int); method @NonNull public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags); method @NonNull public java.util.List<android.content.pm.ModuleInfo> getInstalledModules(int); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int); + method @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int); method @NonNull public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(@NonNull android.content.pm.PackageManager.PackageInfoFlags); method @Deprecated @Nullable public abstract String getInstallerPackageName(@NonNull String); method @NonNull public abstract byte[] getInstantAppCookie(); @@ -12485,20 +12485,20 @@ package android.content.pm { method @NonNull public java.util.Set<java.lang.String> getMimeGroup(@NonNull String); method @NonNull public android.content.pm.ModuleInfo getModuleInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract String getNameForUid(int); - method @Deprecated @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, int); + method @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, int); method @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags); method public abstract int[] getPackageGids(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated public abstract int[] getPackageGids(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public abstract int[] getPackageGids(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public int[] getPackageGids(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.PackageInfo getPackageInfo(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.content.pm.PackageInstaller getPackageInstaller(); - method @Deprecated public abstract int getPackageUid(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public abstract int getPackageUid(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method public int getPackageUid(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract String[] getPackagesForUid(int); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], int); + method @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], int); method @NonNull public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], @NonNull android.content.pm.PackageManager.PackageInfoFlags); method @NonNull public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract android.content.pm.PermissionInfo getPermissionInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; @@ -12507,17 +12507,17 @@ package android.content.pm { method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int); method @NonNull public android.content.pm.PackageManager.Property getProperty(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.PackageManager.Property getProperty(@NonNull String, @NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.content.res.Resources getResourcesForActivity(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.content.res.Resources getResourcesForApplication(@NonNull android.content.pm.ApplicationInfo) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.res.Resources getResourcesForApplication(@NonNull android.content.pm.ApplicationInfo, @Nullable android.content.res.Configuration) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public abstract android.content.res.Resources getResourcesForApplication(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public abstract android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(int); + method @NonNull public abstract java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(int); method @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(@NonNull android.content.pm.PackageManager.PackageInfoFlags); method @Nullable public android.os.Bundle getSuspendedPackageAppExtras(); method public boolean getSyntheticAppDetailsActivityEnabled(@NonNull String); @@ -12546,18 +12546,18 @@ package android.content.pm { method public abstract boolean isSafeMode(); method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryActivityProperty(@NonNull String); method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryApplicationProperty(@NonNull String); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int); + method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int); method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, int); + method @NonNull public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, int); method @NonNull public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, @NonNull android.content.pm.PackageManager.ComponentInfoFlags); method @NonNull public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(@NonNull String, int); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int); + method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int); method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int); + method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int); method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable java.util.List<android.content.Intent>, @NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int); + method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int); method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int); + method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int); method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); method @NonNull public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(@Nullable String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryProviderProperty(@NonNull String); @@ -12568,11 +12568,11 @@ package android.content.pm { method public abstract void removePermission(@NonNull String); method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean removeWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int); method public void requestChecksums(@NonNull String, boolean, int, @NonNull java.util.List<java.security.cert.Certificate>, @NonNull android.content.pm.PackageManager.OnChecksumsReadyListener) throws java.security.cert.CertificateEncodingException, android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int); + method @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int); method @Nullable public android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); - method @Deprecated @Nullable public abstract android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, int); + method @Nullable public abstract android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, int); method @Nullable public android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, @NonNull android.content.pm.PackageManager.ComponentInfoFlags); - method @Deprecated @Nullable public abstract android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, int); + method @Nullable public abstract android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, int); method @Nullable public android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags); method public abstract void setApplicationCategoryHint(@NonNull String, int); method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setApplicationEnabledSetting(@NonNull String, int, int); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ab8812deb23a..0e81da00fa02 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3864,15 +3864,15 @@ package android.content.pm { method @NonNull public boolean canUserUninstall(@NonNull String, @NonNull android.os.UserHandle); method @NonNull public abstract java.util.List<android.content.IntentFilter> getAllIntentFilters(@NonNull String); method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_METADATA) public android.os.PersistableBundle getAppMetadata(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.pm.ApplicationInfo getApplicationInfoAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.pm.ApplicationInfo getApplicationInfoAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.pm.ApplicationInfo getApplicationInfoAsUser(@NonNull String, @NonNull android.content.pm.PackageManager.ApplicationInfoFlags, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; method @NonNull public android.content.pm.dex.ArtManager getArtManager(); - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_SHARED_LIBRARIES) public java.util.List<android.content.pm.SharedLibraryInfo> getDeclaredSharedLibraries(@NonNull String, int); + method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_SHARED_LIBRARIES) public java.util.List<android.content.pm.SharedLibraryInfo> getDeclaredSharedLibraries(@NonNull String, int); method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_SHARED_LIBRARIES) public java.util.List<android.content.pm.SharedLibraryInfo> getDeclaredSharedLibraries(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags); method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract String getDefaultBrowserPackageNameAsUser(int); method @Nullable @RequiresPermission(android.Manifest.permission.SET_HARMFUL_APP_WARNINGS) public CharSequence getHarmfulAppWarning(@NonNull String); method @Nullable public String getIncidentReportApproverPackageName(); - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int); + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(@NonNull android.content.pm.PackageManager.PackageInfoFlags, int); method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_INSTANT_APPS) public abstract android.graphics.drawable.Drawable getInstantAppIcon(String); method @Nullable public abstract android.content.ComponentName getInstantAppInstallerComponent(); @@ -3886,13 +3886,13 @@ package android.content.pm { method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle); method @Deprecated public abstract int installExistingPackage(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException; method @Deprecated public abstract int installExistingPackage(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException; - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(@NonNull android.content.Intent, int, android.os.UserHandle); + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(@NonNull android.content.Intent, int, android.os.UserHandle); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags, @NonNull android.os.UserHandle); - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentActivitiesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentActivitiesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentActivitiesAsUser(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags, @NonNull android.os.UserHandle); - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProvidersAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProvidersAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProvidersAsUser(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags, @NonNull android.os.UserHandle); - method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); + method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags, @NonNull android.os.UserHandle); method public abstract void registerDexModule(@NonNull String, @Nullable android.content.pm.PackageManager.DexModuleRegisterCallback); method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void removeOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener); diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 0e6cda6e0e1c..58b93b3d947f 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -931,7 +931,7 @@ package android.content.pm { method @Nullable public String getDefaultTextClassifierPackageName(); method @RequiresPermission(android.Manifest.permission.INJECT_EVENTS) public android.os.IBinder getHoldLockToken(); method public abstract int getInstallReason(@NonNull String, @NonNull android.os.UserHandle); - method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int); + method @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int); method @NonNull public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags, int); method @Nullable public abstract String[] getNamesForUids(int[]); method @NonNull public String getPermissionControllerPackageName(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a0c620ac26c0..d927c5e37a80 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -5157,6 +5157,8 @@ public abstract class PackageManager { * Retrieve overall information about an application package that is * installed on the system. * + * Use {@link #getPackageInfo(String, PackageInfoFlags)} when long flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of the * desired package. * @param flags Additional option flags to modify the data returned. @@ -5169,9 +5171,7 @@ public abstract class PackageManager { * deleted with {@code DELETE_KEEP_DATA} flag set). * @throws NameNotFoundException if no such package is available to the * caller. - * @deprecated Use {@link #getPackageInfo(String, PackageInfoFlags)} instead. */ - @Deprecated public abstract PackageInfo getPackageInfo(@NonNull String packageName, int flags) throws NameNotFoundException; @@ -5195,6 +5195,8 @@ public abstract class PackageManager { * {@link #VERSION_CODE_HIGHEST} in the {@link VersionedPackage} * constructor. * + * Use {@link #getPackageInfo(VersionedPackage, PackageInfoFlags)} when long flags are needed. + * * @param versionedPackage The versioned package for which to query. * @param flags Additional option flags to modify the data returned. * @return A PackageInfo object containing information about the package. If @@ -5206,9 +5208,7 @@ public abstract class PackageManager { * deleted with {@code DELETE_KEEP_DATA} flag set). * @throws NameNotFoundException if no such package is available to the * caller. - * @deprecated Use {@link #getPackageInfo(VersionedPackage, PackageInfoFlags)} instead. */ - @Deprecated public abstract PackageInfo getPackageInfo(@NonNull VersionedPackage versionedPackage, int flags) throws NameNotFoundException; @@ -5226,6 +5226,8 @@ public abstract class PackageManager { * Retrieve overall information about an application package that is * installed on the system. * + * Use {@link #getPackageInfoAsUser(String, PackageInfoFlags, int)} when long flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of the * desired package. * @param flags Additional option flags to modify the data returned. @@ -5239,10 +5241,8 @@ public abstract class PackageManager { * deleted with {@code DELETE_KEEP_DATA} flag set). * @throws NameNotFoundException if no such package is available to the * caller. - * @deprecated Use {@link #getPackageInfoAsUser(String, PackageInfoFlags, int)} instead. * @hide */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @UnsupportedAppUsage @@ -5376,15 +5376,16 @@ public abstract class PackageManager { * Note that the same package may have different GIDs under different * {@link UserHandle} on the same device. * + * Use {@link #getPackageGids(String, PackageInfoFlags)} when long flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of the * desired package. * @return Returns an int array of the assigned gids, or null if there are * none. * @throws NameNotFoundException if no such package is available to the * caller. - * @deprecated Use {@link #getPackageGids(String, PackageInfoFlags)} instead. */ - @Deprecated + public abstract int[] getPackageGids(@NonNull String packageName, int flags) throws NameNotFoundException; @@ -5404,14 +5405,14 @@ public abstract class PackageManager { * Note that the same package will have different UIDs under different * {@link UserHandle} on the same device. * + * Use {@link #getPackageUid(String, PackageInfoFlags)} when long flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of the * desired package. * @return Returns an integer UID who owns the given package name. * @throws NameNotFoundException if no such package is available to the * caller. - * @deprecated Use {@link #getPackageUid(String, PackageInfoFlags)} instead. */ - @Deprecated public abstract int getPackageUid(@NonNull String packageName, int flags) throws NameNotFoundException; @@ -5445,10 +5446,9 @@ public abstract class PackageManager { /** * See {@link #getPackageUidAsUser(String, PackageInfoFlags, int)}. - * @deprecated Use {@link #getPackageUidAsUser(String, PackageInfoFlags, int)} instead. + * Use {@link #getPackageUidAsUser(String, PackageInfoFlags, int)} when long flags are needed. * @hide */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @UnsupportedAppUsage public abstract int getPackageUidAsUser(@NonNull String packageName, @@ -5589,6 +5589,8 @@ public abstract class PackageManager { * Retrieve all of the information we know about a particular * package/application. * + * Use {@link #getApplicationInfo(String, ApplicationInfoFlags)} when long flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of an * application. * @param flags Additional option flags to modify the data returned. @@ -5601,10 +5603,8 @@ public abstract class PackageManager { * which had been deleted with {@code DELETE_KEEP_DATA} flag set). * @throws NameNotFoundException if a package with the given name cannot be * found on the system. - * @deprecated Use {@link #getApplicationInfo(String, ApplicationInfoFlags)} instead. */ @NonNull - @Deprecated public abstract ApplicationInfo getApplicationInfo(@NonNull String packageName, int flags) throws NameNotFoundException; @@ -5619,13 +5619,13 @@ public abstract class PackageManager { } /** - * @deprecated Use {@link #getApplicationInfoAsUser(String, ApplicationInfoFlags, int)} instead. + * Use {@link #getApplicationInfoAsUser(String, ApplicationInfoFlags, int)} when long flags are + * needed. * {@hide} */ @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage - @Deprecated public abstract ApplicationInfo getApplicationInfoAsUser(@NonNull String packageName, int flags, @UserIdInt int userId) throws NameNotFoundException; @@ -5642,6 +5642,9 @@ public abstract class PackageManager { * Retrieve all of the information we know about a particular * package/application, for a specific user. * + * Use {@link #getApplicationInfoAsUser(String, ApplicationInfoFlags, UserHandle)} when long + * flags are needed. + * * @param packageName The full name (i.e. com.google.apps.contacts) of an * application. * @param flags Additional option flags to modify the data returned. @@ -5654,14 +5657,11 @@ public abstract class PackageManager { * which had been deleted with {@code DELETE_KEEP_DATA} flag set). * @throws NameNotFoundException if a package with the given name cannot be * found on the system. - * @deprecated Use {@link #getApplicationInfoAsUser(String, ApplicationInfoFlags, UserHandle)} - * instead. * @hide */ @NonNull @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi - @Deprecated public ApplicationInfo getApplicationInfoAsUser(@NonNull String packageName, int flags, @NonNull UserHandle user) throws NameNotFoundException { @@ -5694,6 +5694,8 @@ public abstract class PackageManager { * Retrieve all of the information we know about a particular activity * class. * + * Use {@link #getActivityInfo(ComponentName, ComponentInfoFlags)} when long flags are needed. + * * @param component The full component name (i.e. * com.google.apps.contacts/com.google.apps.contacts. * ContactsList) of an Activity class. @@ -5702,9 +5704,7 @@ public abstract class PackageManager { * activity. * @throws NameNotFoundException if a package with the given name cannot be * found on the system. - * @deprecated Use {@link #getActivityInfo(ComponentName, ComponentInfoFlags)} instead. */ - @Deprecated @NonNull public abstract ActivityInfo getActivityInfo(@NonNull ComponentName component, int flags) throws NameNotFoundException; @@ -5734,6 +5734,8 @@ public abstract class PackageManager { * Retrieve all of the information we know about a particular receiver * class. * + * Use {@link #getReceiverInfo(ComponentName, ComponentInfoFlags)} when long flags are needed. + * * @param component The full component name (i.e. * com.google.apps.calendar/com.google.apps.calendar. * CalendarAlarm) of a Receiver class. @@ -5742,9 +5744,7 @@ public abstract class PackageManager { * receiver. * @throws NameNotFoundException if a package with the given name cannot be * found on the system. - * @deprecated Use {@link #getReceiverInfo(ComponentName, ComponentInfoFlags)} instead. */ - @Deprecated @NonNull public abstract ActivityInfo getReceiverInfo(@NonNull ComponentName component, int flags) throws NameNotFoundException; @@ -5762,6 +5762,8 @@ public abstract class PackageManager { /** * Retrieve all of the information we know about a particular service class. * + * Use {@link #getServiceInfo(ComponentName, ComponentInfoFlags)} when long flags are needed. + * * @param component The full component name (i.e. * com.google.apps.media/com.google.apps.media. * BackgroundPlayback) of a Service class. @@ -5769,9 +5771,7 @@ public abstract class PackageManager { * @return A {@link ServiceInfo} object containing information about the * service. * @throws NameNotFoundException if the component cannot be found on the system. - * @deprecated Use {@link #getServiceInfo(ComponentName, ComponentInfoFlags)} instead. */ - @Deprecated @NonNull public abstract ServiceInfo getServiceInfo(@NonNull ComponentName component, int flags) throws NameNotFoundException; @@ -5790,6 +5790,8 @@ public abstract class PackageManager { * Retrieve all of the information we know about a particular content * provider class. * + * Use {@link #getProviderInfo(ComponentName, ComponentInfoFlags)} when long flags are needed. + * * @param component The full component name (i.e. * com.google.providers.media/com.google.providers.media. * MediaProvider) of a ContentProvider class. @@ -5798,9 +5800,7 @@ public abstract class PackageManager { * provider. * @throws NameNotFoundException if a package with the given name cannot be * found on the system. - * @deprecated Use {@link #getProviderInfo(ComponentName, ComponentInfoFlags)} instead. */ - @Deprecated @NonNull public abstract ProviderInfo getProviderInfo(@NonNull ComponentName component, int flags) throws NameNotFoundException; @@ -5849,6 +5849,8 @@ public abstract class PackageManager { /** * Return a List of all packages that are installed for the current user. * + * Use {@link #getInstalledPackages(PackageInfoFlags)} when long flags are needed. + * * @param flags Additional option flags to modify the data returned. * @return A List of PackageInfo objects, one for each installed package, * containing information about the package. In the unlikely case @@ -5858,15 +5860,12 @@ public abstract class PackageManager { * applications (which includes installed applications as well as * applications with data directory i.e. applications which had been * deleted with {@code DELETE_KEEP_DATA} flag set). - * @deprecated Use {@link #getInstalledPackages(PackageInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<PackageInfo> getInstalledPackages(int flags); /** * See {@link #getInstalledPackages(int)}. - * @param flags */ @NonNull public List<PackageInfo> getInstalledPackages(@NonNull PackageInfoFlags flags) { @@ -5896,6 +5895,9 @@ public abstract class PackageManager { * Return a List of all installed packages that are currently holding any of * the given permissions. * + * Use {@link #getPackagesHoldingPermissions(String[], PackageInfoFlags)} when long flags are + * needed. + * * @param flags Additional option flags to modify the data returned. * @return A List of PackageInfo objects, one for each installed package * that holds any of the permissions that were provided, containing @@ -5906,9 +5908,7 @@ public abstract class PackageManager { * applications (which includes installed applications as well as * applications with data directory i.e. applications which had been * deleted with {@code DELETE_KEEP_DATA} flag set). - * @deprecated Use {@link #getPackagesHoldingPermissions(String[], PackageInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<PackageInfo> getPackagesHoldingPermissions( @NonNull String[] permissions, int flags); @@ -5927,6 +5927,8 @@ public abstract class PackageManager { * Return a List of all packages that are installed on the device, for a * specific user. * + * Use {@link #getInstalledPackagesAsUser(PackageInfoFlags, int)} when long flags are needed. + * * @param flags Additional option flags to modify the data returned. * @param userId The user for whom the installed packages are to be listed * @return A List of PackageInfo objects, one for each installed package, @@ -5937,10 +5939,8 @@ public abstract class PackageManager { * applications (which includes installed applications as well as * applications with data directory i.e. applications which had been * deleted with {@code DELETE_KEEP_DATA} flag set). - * @deprecated Use {@link #getInstalledPackagesAsUser(PackageInfoFlags, int)} instead. * @hide */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi @@ -6652,6 +6652,8 @@ public abstract class PackageManager { * applications including those deleted with {@code DELETE_KEEP_DATA} * (partially installed apps with data directory) will be returned. * + * Use {@link #getInstalledApplications(ApplicationInfoFlags)} when long flags are needed. + * * @param flags Additional option flags to modify the data returned. * @return A List of ApplicationInfo objects, one for each installed * application. In the unlikely case there are no installed @@ -6661,10 +6663,8 @@ public abstract class PackageManager { * applications (which includes installed applications as well as * applications with data directory i.e. applications which had been * deleted with {@code DELETE_KEEP_DATA} flag set). - * @deprecated Use {@link #getInstalledApplications(ApplicationInfoFlags)} instead. */ @NonNull - @Deprecated public abstract List<ApplicationInfo> getInstalledApplications(int flags); /** @@ -6683,6 +6683,9 @@ public abstract class PackageManager { * {@code DELETE_KEEP_DATA} (partially installed apps with data directory) * will be returned. * + * Use {@link #getInstalledApplicationsAsUser(ApplicationInfoFlags, int)} when long flags are + * needed. + * * @param flags Additional option flags to modify the data returned. * @param userId The user for whom the installed applications are to be * listed @@ -6694,13 +6697,11 @@ public abstract class PackageManager { * applications (which includes installed applications as well as * applications with data directory i.e. applications which had been * deleted with {@code DELETE_KEEP_DATA} flag set). - * @deprecated Use {@link #getInstalledApplicationsAsUser(ApplicationInfoFlags, int)} instead. * @hide */ @SuppressWarnings("HiddenAbstractMethod") @NonNull @TestApi - @Deprecated public abstract List<ApplicationInfo> getInstalledApplicationsAsUser( int flags, @UserIdInt int userId); @@ -6859,13 +6860,13 @@ public abstract class PackageManager { /** * Get a list of shared libraries on the device. * + * Use {@link #getSharedLibraries(PackageInfoFlags)} when long flags are needed. + * * @param flags To filter the libraries to return. * @return The shared library list. * * @see #MATCH_UNINSTALLED_PACKAGES - * @deprecated Use {@link #getSharedLibraries(PackageInfoFlags)} instead. */ - @Deprecated public abstract @NonNull List<SharedLibraryInfo> getSharedLibraries(int flags); /** @@ -6880,6 +6881,8 @@ public abstract class PackageManager { /** * Get a list of shared libraries on the device. * + * Use {@link #getSharedLibrariesAsUser(PackageInfoFlags, int)} when long flags are needed. + * * @param flags To filter the libraries to return. * @param userId The user to query for. * @return The shared library list. @@ -6890,9 +6893,7 @@ public abstract class PackageManager { * @see #MATCH_UNINSTALLED_PACKAGES * * @hide - * @deprecated Use {@link #getSharedLibrariesAsUser(PackageInfoFlags, int)} instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") public abstract @NonNull List<SharedLibraryInfo> getSharedLibrariesAsUser(int flags, @UserIdInt int userId); @@ -6910,14 +6911,14 @@ public abstract class PackageManager { /** * Get the list of shared libraries declared by a package. * + * Use {@link #getDeclaredSharedLibraries(String, PackageInfoFlags)} when long flags are needed. + * * @param packageName the package name to query * @param flags the flags to filter packages * @return the shared library list * * @hide - * @deprecated Use {@link #getDeclaredSharedLibraries(String, PackageInfoFlags)} instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @RequiresPermission(Manifest.permission.ACCESS_SHARED_LIBRARIES) @@ -7026,6 +7027,8 @@ public abstract class PackageManager { * Intent.resolveActivity(PackageManager)} do. * </p> * + * Use {@link #resolveActivity(Intent, ResolveInfoFlags)} when long flags are needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. The @@ -7037,9 +7040,7 @@ public abstract class PackageManager { * matching activity was found. If multiple matching activities are * found and there is no default set, returns a ResolveInfo object * containing something else, such as the activity resolver. - * @deprecated Use {@link #resolveActivity(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @Nullable public abstract ResolveInfo resolveActivity(@NonNull Intent intent, int flags); @@ -7066,6 +7067,8 @@ public abstract class PackageManager { * Intent.resolveActivity(PackageManager)} do. * </p> * + * Use {@link #resolveActivityAsUser(Intent, ResolveInfoFlags, int)} when long flags are needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. The @@ -7079,9 +7082,7 @@ public abstract class PackageManager { * found and there is no default set, returns a ResolveInfo object * containing something else, such as the activity resolver. * @hide - * @deprecated Use {@link #resolveActivityAsUser(Intent, ResolveInfoFlags, int)} instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @Nullable @UnsupportedAppUsage @@ -7102,6 +7103,8 @@ public abstract class PackageManager { /** * Retrieve all activities that can be performed for the given intent. * + * Use {@link #queryIntentActivities(Intent, ResolveInfoFlags)} when long flags are needed. + * * @param intent The desired intent as per resolveActivity(). * @param flags Additional option flags to modify the data returned. The * most important is {@link #MATCH_DEFAULT_ONLY}, to limit the @@ -7113,9 +7116,7 @@ public abstract class PackageManager { * words, the first item is what would be returned by * {@link #resolveActivity}. If there are no matching activities, an * empty list is returned. - * @deprecated Use {@link #queryIntentActivities(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ResolveInfo> queryIntentActivities(@NonNull Intent intent, int flags); @@ -7133,6 +7134,9 @@ public abstract class PackageManager { * Retrieve all activities that can be performed for the given intent, for a * specific user. * + * Use {@link #queryIntentActivitiesAsUser(Intent, ResolveInfoFlags, int)} when long flags are + * needed. + * * @param intent The desired intent as per resolveActivity(). * @param flags Additional option flags to modify the data returned. The * most important is {@link #MATCH_DEFAULT_ONLY}, to limit the @@ -7145,9 +7149,7 @@ public abstract class PackageManager { * {@link #resolveActivity}. If there are no matching activities, an * empty list is returned. * @hide - * @deprecated Use {@link #queryIntentActivitiesAsUser(Intent, ResolveInfoFlags, int)} instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage @@ -7169,6 +7171,9 @@ public abstract class PackageManager { * Retrieve all activities that can be performed for the given intent, for a * specific user. * + * Use {@link #queryIntentActivitiesAsUser(Intent, ResolveInfoFlags, UserHandle)} when long + * flags are needed. + * * @param intent The desired intent as per resolveActivity(). * @param flags Additional option flags to modify the data returned. The * most important is {@link #MATCH_DEFAULT_ONLY}, to limit the @@ -7182,10 +7187,7 @@ public abstract class PackageManager { * {@link #resolveActivity}. If there are no matching activities, an * empty list is returned. * @hide - * @deprecated Use {@link #queryIntentActivitiesAsUser(Intent, ResolveInfoFlags, UserHandle)} - * instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @@ -7215,6 +7217,9 @@ public abstract class PackageManager { * final ResolveInfo list in a reasonable order, with no duplicates, based * on those inputs. * + * Use {@link #queryIntentActivityOptions(ComponentName, List, Intent, ResolveInfoFlags)} when + * long flags are needed. + * * @param caller The class name of the activity that is making the request. * This activity will never appear in the output list. Can be * null. @@ -7231,10 +7236,7 @@ public abstract class PackageManager { * activities that can handle <var>intent</var> but did not get * included by one of the <var>specifics</var> intents. If there are * no matching activities, an empty list is returned. - * @deprecated Use {@link #queryIntentActivityOptions(ComponentName, List, Intent, - * ResolveInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ResolveInfo> queryIntentActivityOptions(@Nullable ComponentName caller, @Nullable Intent[] specifics, @NonNull Intent intent, int flags); @@ -7253,14 +7255,14 @@ public abstract class PackageManager { /** * Retrieve all receivers that can handle a broadcast of the given intent. * + * Use {@link #queryBroadcastReceivers(Intent, ResolveInfoFlags)} when long flags are needed. + * * @param intent The desired intent as per resolveActivity(). * @param flags Additional option flags to modify the data returned. * @return Returns a List of ResolveInfo objects containing one entry for * each matching receiver, ordered from best to worst. If there are * no matching receivers, an empty list or null is returned. - * @deprecated Use {@link #queryBroadcastReceivers(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ResolveInfo> queryBroadcastReceivers(@NonNull Intent intent, int flags); @@ -7278,6 +7280,9 @@ public abstract class PackageManager { * Retrieve all receivers that can handle a broadcast of the given intent, * for a specific user. * + * Use {@link #queryBroadcastReceiversAsUser(Intent, ResolveInfoFlags, UserHandle)} when long + * flags are needed. + * * @param intent The desired intent as per resolveActivity(). * @param flags Additional option flags to modify the data returned. * @param userHandle UserHandle of the user being queried. @@ -7285,10 +7290,7 @@ public abstract class PackageManager { * each matching receiver, ordered from best to worst. If there are * no matching receivers, an empty list or null is returned. * @hide - * @deprecated Use {@link #queryBroadcastReceiversAsUser(Intent, ResolveInfoFlags, UserHandle)} - * instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @SystemApi @@ -7312,10 +7314,9 @@ public abstract class PackageManager { /** * @hide - * @deprecated Use {@link #queryBroadcastReceiversAsUser(Intent, ResolveInfoFlags, int)} - * instead. + * Use {@link #queryBroadcastReceiversAsUser(Intent, ResolveInfoFlags, int)} when long flags are + * needed. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage @@ -7353,15 +7354,15 @@ public abstract class PackageManager { /** * Determine the best service to handle for a given Intent. * + * Use {@link #resolveService(Intent, ResolveInfoFlags)} when long flags are needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. * @return Returns a ResolveInfo object containing the final service intent * that was determined to be the best action. Returns null if no * matching service was found. - * @deprecated Use {@link #resolveService(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @Nullable public abstract ResolveInfo resolveService(@NonNull Intent intent, int flags); @@ -7376,9 +7377,8 @@ public abstract class PackageManager { /** * @hide - * @deprecated Use {@link #resolveServiceAsUser(Intent, ResolveInfoFlags, int)} instead. + * Use {@link #resolveServiceAsUser(Intent, ResolveInfoFlags, int)} when long flags are needed. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @Nullable public abstract ResolveInfo resolveServiceAsUser(@NonNull Intent intent, @@ -7398,6 +7398,8 @@ public abstract class PackageManager { /** * Retrieve all services that can match the given intent. * + * Use {@link #queryIntentServices(Intent, ResolveInfoFlags)} when long flags are needed. + * * @param intent The desired intent as per resolveService(). * @param flags Additional option flags to modify the data returned. * @return Returns a List of ResolveInfo objects containing one entry for @@ -7405,9 +7407,7 @@ public abstract class PackageManager { * words, the first item is what would be returned by * {@link #resolveService}. If there are no matching services, an * empty list or null is returned. - * @deprecated Use {@link #queryIntentServices(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ResolveInfo> queryIntentServices(@NonNull Intent intent, int flags); @@ -7425,6 +7425,9 @@ public abstract class PackageManager { /** * Retrieve all services that can match the given intent for a given user. * + * Use {@link #queryIntentServicesAsUser(Intent, ResolveInfoFlags, int)} when long flags are + * needed. + * * @param intent The desired intent as per resolveService(). * @param flags Additional option flags to modify the data returned. * @param userId The user id. @@ -7434,9 +7437,7 @@ public abstract class PackageManager { * {@link #resolveService}. If there are no matching services, an * empty list or null is returned. * @hide - * @deprecated Use {@link #queryIntentServicesAsUser(Intent, ResolveInfoFlags, int)} instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage @@ -7457,6 +7458,9 @@ public abstract class PackageManager { /** * Retrieve all services that can match the given intent for a given user. * + * Use {@link #queryIntentServicesAsUser(Intent, ResolveInfoFlags, UserHandle)} when long flags + * are needed. + * * @param intent The desired intent as per resolveService(). * @param flags Additional option flags to modify the data returned. * @param user The user being queried. @@ -7466,10 +7470,7 @@ public abstract class PackageManager { * {@link #resolveService}. If there are no matching services, an * empty list or null is returned. * @hide - * @deprecated Use {@link #queryIntentServicesAsUser(Intent, ResolveInfoFlags, UserHandle)} - * instead. */ - @Deprecated @NonNull @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi @@ -7492,6 +7493,9 @@ public abstract class PackageManager { /** * Retrieve all providers that can match the given intent. * + * Use {@link #queryIntentContentProvidersAsUser(Intent, ResolveInfoFlags, int)} when long flags + * are needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. @@ -7500,10 +7504,7 @@ public abstract class PackageManager { * each matching provider, ordered from best to worst. If there are * no matching services, an empty list or null is returned. * @hide - * @deprecated Use {@link #queryIntentContentProvidersAsUser(Intent, ResolveInfoFlags, int)} - * instead. */ - @Deprecated @SuppressWarnings("HiddenAbstractMethod") @NonNull @UnsupportedAppUsage @@ -7524,6 +7525,9 @@ public abstract class PackageManager { /** * Retrieve all providers that can match the given intent. * + * Use {@link #queryIntentContentProvidersAsUser(Intent, ResolveInfoFlags, UserHandle)} when + * long flags are needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. @@ -7532,10 +7536,7 @@ public abstract class PackageManager { * each matching provider, ordered from best to worst. If there are * no matching services, an empty list or null is returned. * @hide - * @deprecated Use {@link #queryIntentContentProvidersAsUser(Intent, ResolveInfoFlags, - * UserHandle)} instead. */ - @Deprecated @NonNull @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS) @SystemApi @@ -7559,15 +7560,16 @@ public abstract class PackageManager { /** * Retrieve all providers that can match the given intent. * + * Use {@link #queryIntentContentProviders(Intent, ResolveInfoFlags)} when long flags are + * needed. + * * @param intent An intent containing all of the desired specification * (action, data, type, category, and/or component). * @param flags Additional option flags to modify the data returned. * @return Returns a List of ResolveInfo objects containing one entry for * each matching provider, ordered from best to worst. If there are * no matching services, an empty list or null is returned. - * @deprecated Use {@link #queryIntentContentProviders(Intent, ResolveInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ResolveInfo> queryIntentContentProviders(@NonNull Intent intent, int flags); @@ -7591,13 +7593,13 @@ public abstract class PackageManager { * ProviderInfo info = packageManager.resolveContentProvider(uri.getAuthority(), flags); * </pre> * + * Use {@link #resolveContentProvider(String, ComponentInfoFlags)} when long flags are needed. + * * @param authority The authority of the provider to find. * @param flags Additional option flags to modify the data returned. * @return A {@link ProviderInfo} object containing information about the * provider. If a provider was not found, returns null. - * @deprecated Use {@link #resolveContentProvider(String, ComponentInfoFlags)} instead. */ - @Deprecated @Nullable public abstract ProviderInfo resolveContentProvider(@NonNull String authority, int flags); @@ -7615,14 +7617,15 @@ public abstract class PackageManager { /** * Find a single content provider by its base path name. * + * Use {@link #resolveContentProviderAsUser(String, ComponentInfoFlags, int)} when long flags + * are needed. + * * @param providerName The name of the provider to find. * @param flags Additional option flags to modify the data returned. * @param userId The user id. * @return A {@link ProviderInfo} object containing information about the * provider. If a provider was not found, returns null. * @hide - * @deprecated Use {@link #resolveContentProviderAsUser(String, ComponentInfoFlags, int)} - * instead. */ @SuppressWarnings("HiddenAbstractMethod") @Nullable @@ -7647,6 +7650,9 @@ public abstract class PackageManager { * <em>Note: unlike most other methods, an empty result set is indicated * by a null return instead of an empty list.</em> * + * Use {@link #queryContentProviders(String, int, ComponentInfoFlags)} when long flags are + * needed. + * * @param processName If non-null, limits the returned providers to only * those that are hosted by the given process. If null, all * content providers are returned. @@ -7657,9 +7663,7 @@ public abstract class PackageManager { * each provider either matching <var>processName</var> or, if * <var>processName</var> is null, all known content providers. * <em>If there are no matching providers, null is returned.</em> - * @deprecated Use {@link #queryContentProviders(String, int, ComponentInfoFlags)} instead. */ - @Deprecated @NonNull public abstract List<ProviderInfo> queryContentProviders( @Nullable String processName, int uid, int flags); @@ -7687,11 +7691,11 @@ public abstract class PackageManager { * to mark GAL providers, rather than intent filters, so we can't use * {@link #queryIntentContentProviders} for that. * + * Use {@link #queryContentProviders(String, int, ComponentInfoFlags, String)} when long flags + * are needed. + * * @hide - * @deprecated Use {@link #queryContentProviders(String, int, ComponentInfoFlags, String)} - * instead. */ - @Deprecated @NonNull public List<ProviderInfo> queryContentProviders(@Nullable String processName, int uid, int flags, String metaDataKey) { @@ -8237,13 +8241,13 @@ public abstract class PackageManager { * Retrieve overall information about an application package defined in a * package archive file * + * Use {@link #getPackageArchiveInfo(String, PackageInfoFlags)} when long flags are needed. + * * @param archiveFilePath The path to the archive file * @param flags Additional option flags to modify the data returned. * @return A PackageInfo object containing information about the package * archive. If the package could not be parsed, returns null. - * @deprecated Use {@link #getPackageArchiveInfo(String, PackageInfoFlags)} instead. */ - @Deprecated @Nullable public PackageInfo getPackageArchiveInfo(@NonNull String archiveFilePath, int flags) { return getPackageArchiveInfo(archiveFilePath, PackageInfoFlags.of(flags)); diff --git a/test-mock/api/current.txt b/test-mock/api/current.txt index c5169e502344..d1a68d4e9cb2 100644 --- a/test-mock/api/current.txt +++ b/test-mock/api/current.txt @@ -235,7 +235,6 @@ package android.test.mock { method @Deprecated public android.content.Intent getLaunchIntentForPackage(String); method @Deprecated public android.content.Intent getLeanbackLaunchIntentForPackage(String); method @Deprecated public String getNameForUid(int); - method @Deprecated public android.content.pm.PackageInfo getPackageArchiveInfo(String, int); method @Deprecated public int[] getPackageGids(String) throws android.content.pm.PackageManager.NameNotFoundException; method @Deprecated public int[] getPackageGids(String, int) throws android.content.pm.PackageManager.NameNotFoundException; method @Deprecated public android.content.pm.PackageInfo getPackageInfo(String, int) throws android.content.pm.PackageManager.NameNotFoundException; |