Merge "Deprecate getPreferredPackages() and related APIs" (4a182739) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -11339,7 +11339,7 @@ package android.content.pm {
		method public abstract int checkSignatures(java.lang.String, java.lang.String);
		method public abstract int checkSignatures(int, int);
		method public abstract void clearInstantAppCookie();
		method public abstract void clearPackagePreferredActivities(java.lang.String);
		method public abstract deprecated void clearPackagePreferredActivities(java.lang.String);
		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
		method public abstract void extendVerificationTimeout(int, int, long);
		method public abstract android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		@@ -11383,8 +11383,8 @@ package android.content.pm {
		method public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
		method public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
		method public abstract java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
		method public abstract deprecated int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
		method public abstract deprecated java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
		method public abstract android.content.pm.ProviderInfo getProviderInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.ActivityInfo getReceiverInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.res.Resources getResourcesForActivity(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1240,7 +1240,7 @@ package android.content.pm {
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(android.content.Intent, int, android.os.UserHandle);
		method public abstract void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback);
		method public abstract void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
		method public void replacePreferredActivity(android.content.IntentFilter, int, java.util.List<android.content.ComponentName>, android.content.ComponentName);
		method public deprecated void replacePreferredActivity(android.content.IntentFilter, int, java.util.List<android.content.ComponentName>, android.content.ComponentName);
		method public abstract void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
		method public void sendDeviceCustomizationReadyBroadcast();
		method public abstract boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);

core/java/android/content/pm/PackageManager.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -5372,6 +5372,10 @@ public abstract class PackageManager {
		public abstract void removePackageFromPreferred(String packageName);

		/**
		* @deprecated This function no longer does anything; it was an old
		* approach to managing preferred activities, which has been superseded
		* by (and conflicts with) the modern activity-based preferences.
		*
		* Retrieve the list of all currently configured preferred packages. The
		* first package on the list is the most preferred, the last is the least
		* preferred.
		@@ -5380,6 +5384,7 @@ public abstract class PackageManager {
		* @return A List of PackageInfo objects, one for each preferred
		* application, in order of preference.
		*/
		@Deprecated
		public abstract List<PackageInfo> getPreferredPackages(@PackageInfoFlags int flags);

		/**
		@@ -5406,11 +5411,16 @@ public abstract class PackageManager {
		ComponentName[] set, ComponentName activity);

		/**
		* @deprecated This is a protected API that should not have been available
		* to third party applications. It is the platform's responsibility for
		* assigning preferred activities and this cannot be directly modified.
		*
		* Same as {@link #addPreferredActivity(IntentFilter, int,
		ComponentName[], ComponentName)}, but with a specific userId to apply the preference
		to.
		* @hide
		*/
		@Deprecated
		@UnsupportedAppUsage
		public void addPreferredActivityAsUser(IntentFilter filter, int match,
		ComponentName[] set, ComponentName activity, @UserIdInt int userId) {
		@@ -5444,6 +5454,10 @@ public abstract class PackageManager {
		ComponentName[] set, ComponentName activity);

		/**
		* @deprecated This is a protected API that should not have been available
		* to third party applications. It is the platform's responsibility for
		* assigning preferred activities and this cannot be directly modified.
		*
		* Replaces an existing preferred activity mapping to the system, and if that were not present
		* adds a new preferred activity. This will be used to automatically select the given activity
		* component when {@link Context#startActivity(Intent) Context.startActivity()} finds multiple
		@@ -5459,6 +5473,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		@Deprecated
		@SystemApi
		public void replacePreferredActivity(@NonNull IntentFilter filter, int match,
		@NonNull List<ComponentName> set, @NonNull ComponentName activity) {
		@@ -5476,6 +5491,10 @@ public abstract class PackageManager {
		}

		/**
		* @deprecated This function no longer does anything; it was an old
		* approach to managing preferred activities, which has been superseded
		* by (and conflicts with) the modern activity-based preferences.
		*
		* Remove all preferred activity mappings, previously added with
		* {@link #addPreferredActivity}, from the
		* system whose activities are implemented in the given package name.
		@@ -5484,9 +5503,14 @@ public abstract class PackageManager {
		* @param packageName The name of the package whose preferred activity
		* mappings are to be removed.
		*/
		@Deprecated
		public abstract void clearPackagePreferredActivities(String packageName);

		/**
		* @deprecated This function no longer does anything; it was an old
		* approach to managing preferred activities, which has been superseded
		* by (and conflicts with) the modern activity-based preferences.
		*
		* Retrieve all preferred activities, previously added with
		* {@link #addPreferredActivity}, that are
		* currently registered with the system.
		@@ -5503,6 +5527,7 @@ public abstract class PackageManager {
		* (the number of distinct IntentFilter records, not the number of unique
		* activity components) that were found.
		*/
		@Deprecated
		public abstract int getPreferredActivities(@NonNull List<IntentFilter> outFilters,
		@NonNull List<ComponentName> outActivities, String packageName);