Merge "Update references of "DONT_DELETE_DATA" to "DELETE_KEEP_DATA"." (04ca345e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ interface IPackageManager {
		* @param versionedPackage The package to delete.
		* @param observer a callback to use to notify when the package deletion in finished.
		* @param userId the id of the user for whom to delete the package
		* @param flags - possible values: {@link #DONT_DELETE_DATA}
		* @param flags - possible values: {@link #DELETE_KEEP_DATA}
		*/
		void deletePackageVersioned(in VersionedPackage versionedPackage,
		IPackageDeleteObserver2 observer, int userId, int flags);

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -369,7 +369,7 @@ public abstract class PackageManager {
		* Flag parameter to retrieve some information about all applications (even
		* uninstalled ones) which have data directories. This state could have
		* resulted if applications have been deleted with flag
		* {@code DONT_DELETE_DATA} with a possibility of being replaced or
		* {@code DELETE_KEEP_DATA} with a possibility of being replaced or
		* reinstalled in future.
		* <p>
		* Note: this flag may cause less information about currently installed
		@@ -3534,7 +3534,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		* @throws NameNotFoundException if a package with the given name cannot be
		* found on the system.
		*/
		@@ -3560,7 +3560,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		* @throws NameNotFoundException if a package with the given name cannot be
		* found on the system.
		*/
		@@ -3581,7 +3581,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		* @throws NameNotFoundException if a package with the given name cannot be
		* found on the system.
		* @hide
		@@ -3828,7 +3828,7 @@ public abstract class PackageManager {
		* the application information is retrieved from the list of
		* uninstalled applications (which includes installed applications
		* as well as applications with data directory i.e. applications
		* which had been deleted with {@code DONT_DELETE_DATA} flag set).
		* 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.
		*/
		@@ -3855,7 +3855,7 @@ public abstract class PackageManager {
		* the application information is retrieved from the list of
		* uninstalled applications (which includes installed applications
		* as well as applications with data directory i.e. applications
		* which had been deleted with {@code DONT_DELETE_DATA} flag set).
		* 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.
		* @hide
		@@ -3978,7 +3978,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		*/
		@NonNull
		public abstract List<PackageInfo> getInstalledPackages(@PackageInfoFlags int flags);
		@@ -3996,7 +3996,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		*/
		@NonNull
		public abstract List<PackageInfo> getPackagesHoldingPermissions(
		@@ -4015,7 +4015,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		* @hide
		*/
		@NonNull
		@@ -4561,7 +4561,7 @@ public abstract class PackageManager {
		/**
		* Return a List of all application packages that are installed for the
		* current user. If flag GET_UNINSTALLED_PACKAGES has been set, a list of all
		* applications including those deleted with {@code DONT_DELETE_DATA}
		* applications including those deleted with {@code DELETE_KEEP_DATA}
		* (partially installed apps with data directory) will be returned.
		*
		* @param flags Additional option flags to modify the data returned.
		@@ -4572,7 +4572,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		*/
		@NonNull
		public abstract List<ApplicationInfo> getInstalledApplications(@ApplicationInfoFlags int flags);
		@@ -4581,7 +4581,7 @@ public abstract class PackageManager {
		* Return a List of all application packages that are installed on the
		* device, for a specific user. If flag GET_UNINSTALLED_PACKAGES has been
		* set, a list of all applications including those deleted with
		* {@code DONT_DELETE_DATA} (partially installed apps with data directory)
		* {@code DELETE_KEEP_DATA} (partially installed apps with data directory)
		* will be returned.
		*
		* @param flags Additional option flags to modify the data returned.
		@@ -4594,7 +4594,7 @@ public abstract class PackageManager {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		* @hide
		*/
		@NonNull

services/core/java/android/content/pm/PackageManagerInternal.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public abstract class PackageManagerInternal {
		* Return a List of all application packages that are installed on the
		* device, for a specific user. If flag GET_UNINSTALLED_PACKAGES has been
		* set, a list of all applications including those deleted with
		* {@code DONT_DELETE_DATA} (partially installed apps with data directory)
		* {@code DELETE_KEEP_DATA} (partially installed apps with data directory)
		* will be returned.
		*
		* @param flags Additional option flags to modify the data returned.
		@@ -184,7 +184,7 @@ public abstract class PackageManagerInternal {
		* information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* deleted with {@code DELETE_KEEP_DATA} flag set).
		*/
		public abstract List<ApplicationInfo> getInstalledApplications(
		@ApplicationInfoFlags int flags, @UserIdInt int userId, int callingUid);

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -17699,7 +17699,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}

		/*
		* This method deletes the package from internal data structures. If the DONT_DELETE_DATA
		* This method deletes the package from internal data structures. If the DELETE_KEEP_DATA
		* flag is not set, the data directory is removed as well.
		* make sure this flag is set for partially installed apps. If not its meaningless to
		* delete a partially installed application.

services/usage/java/com/android/server/usage/UsageStatsService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -369,7 +369,7 @@ public class UsageStatsService extends SystemService implements
		/**
		* Fetches a map (package_name:install_time) of installed packages for the given user. This
		* map contains all installed packages, including those packages which have been uninstalled
		* with the DONT_DELETE_DATA flag.
		* with the DELETE_KEEP_DATA flag.
		* This is a helper method which should only be called when the given user's usage stats service
		* is initialized; it performs a heavy query to package manager so do not call it otherwise.
		* <br/>