diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index b3d8eb51e324a..93126b8002ade 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -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); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index fe5e67234fc44..43feaac6d5d81 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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. *

* Note: this flag may cause less information about currently installed @@ -3517,7 +3517,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. */ @@ -3543,7 +3543,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. */ @@ -3564,7 +3564,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 @@ -3811,7 +3811,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. */ @@ -3838,7 +3838,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 @@ -3961,7 +3961,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 getInstalledPackages(@PackageInfoFlags int flags); @@ -3979,7 +3979,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 getPackagesHoldingPermissions( @@ -3998,7 +3998,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 @@ -4544,7 +4544,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. @@ -4555,7 +4555,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 getInstalledApplications(@ApplicationInfoFlags int flags); @@ -4564,7 +4564,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. @@ -4577,7 +4577,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 diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 368416b0d4a19..abd754951f9cf 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -169,7 +169,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. @@ -183,7 +183,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 getInstalledApplications( @ApplicationInfoFlags int flags, @UserIdInt int userId, int callingUid); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3a333136abe68..b20dbe7c67ab0 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -17697,7 +17697,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. diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index b8cd378602844..5119e5824f7fe 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -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. *