am 418172bf: am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs

* commit '418172bf8823016785526b433801d44a4630f276':
  Doc change: Fix typo DONT_DELTE
This commit is contained in:
kmccormick
2013-03-27 18:59:42 -07:00
committed by Android Git Automerger

View File

@@ -1211,8 +1211,8 @@ public abstract class PackageManager {
* package is not found in the list of installed applications, the * package is not found in the list of installed applications, the
* package information is retrieved from the list of uninstalled * package information is retrieved from the list of uninstalled
* applications (which includes installed applications as well as * applications (which includes installed applications as well as
* applications with data directory ie applications which had been * applications with data directory i.e. applications which had been
* deleted with DONT_DELTE_DATA flag set). * deleted with {@code DONT_DELETE_DATA} flag set).
* @see #GET_ACTIVITIES * @see #GET_ACTIVITIES
* @see #GET_GIDS * @see #GET_GIDS
* @see #GET_CONFIGURATIONS * @see #GET_CONFIGURATIONS
@@ -1364,7 +1364,7 @@ public abstract class PackageManager {
* list of uninstalled applications(which includes * list of uninstalled applications(which includes
* installed applications as well as applications * installed applications as well as applications
* with data directory ie applications which had been * with data directory ie applications which had been
* deleted with DONT_DELTE_DATA flag set). * deleted with {@code DONT_DELETE_DATA} flag set).
* *
* @see #GET_META_DATA * @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES * @see #GET_SHARED_LIBRARY_FILES
@@ -1483,7 +1483,7 @@ public abstract class PackageManager {
* installed on the device. In the unlikely case of there being no * installed on the device. In the unlikely case of there being no
* installed packages, an empty list is returned. * installed packages, an empty list is returned.
* If flag GET_UNINSTALLED_PACKAGES is set, a list of all * If flag GET_UNINSTALLED_PACKAGES is set, a list of all
* applications including those deleted with DONT_DELETE_DATA * applications including those deleted with {@code DONT_DELETE_DATA}
* (partially installed apps with data directory) will be returned. * (partially installed apps with data directory) will be returned.
* *
* @see #GET_ACTIVITIES * @see #GET_ACTIVITIES
@@ -1521,7 +1521,7 @@ public abstract class PackageManager {
* installed on the device. In the unlikely case of there being no * installed on the device. In the unlikely case of there being no
* installed packages, an empty list is returned. * installed packages, an empty list is returned.
* If flag GET_UNINSTALLED_PACKAGES is set, a list of all * If flag GET_UNINSTALLED_PACKAGES is set, a list of all
* applications including those deleted with DONT_DELETE_DATA * applications including those deleted with {@code DONT_DELETE_DATA}
* (partially installed apps with data directory) will be returned. * (partially installed apps with data directory) will be returned.
* *
* @see #GET_ACTIVITIES * @see #GET_ACTIVITIES
@@ -1726,7 +1726,7 @@ public abstract class PackageManager {
/** /**
* Return a List of all application packages that are installed on the * Return a List of all application packages that are installed on the
* device. If flag GET_UNINSTALLED_PACKAGES has been set, a list of all * device. If flag GET_UNINSTALLED_PACKAGES has been set, a list of all
* applications including those deleted with DONT_DELETE_DATA(partially * applications including those deleted with {@code DONT_DELETE_DATA} (partially
* installed apps with data directory) will be returned. * installed apps with data directory) will be returned.
* *
* @param flags Additional option flags. Use any combination of * @param flags Additional option flags. Use any combination of
@@ -1737,7 +1737,7 @@ public abstract class PackageManager {
* is installed on the device. In the unlikely case of there being * is installed on the device. In the unlikely case of there being
* no installed applications, an empty list is returned. * no installed applications, an empty list is returned.
* If flag GET_UNINSTALLED_PACKAGES is set, a list of all * If flag GET_UNINSTALLED_PACKAGES is set, a list of all
* applications including those deleted with DONT_DELETE_DATA * applications including those deleted with {@code DONT_DELETE_DATA}
* (partially installed apps with data directory) will be returned. * (partially installed apps with data directory) will be returned.
* *
* @see #GET_META_DATA * @see #GET_META_DATA
@@ -2288,7 +2288,7 @@ public abstract class PackageManager {
* *
* @return Returns the label associated with this application, or null if * @return Returns the label associated with this application, or null if
* it could not be found for any reason. * it could not be found for any reason.
* @param info The application to get the label of * @param info The application to get the label of.
*/ */
public abstract CharSequence getApplicationLabel(ApplicationInfo info); public abstract CharSequence getApplicationLabel(ApplicationInfo info);
@@ -2496,7 +2496,7 @@ public abstract class PackageManager {
* {@link PackageManager#VERIFICATION_REJECT}. * {@link PackageManager#VERIFICATION_REJECT}.
* *
* @param id pending package identifier as passed via the * @param id pending package identifier as passed via the
* {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra * {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra.
* @param verificationCode either {@link PackageManager#VERIFICATION_ALLOW} * @param verificationCode either {@link PackageManager#VERIFICATION_ALLOW}
* or {@link PackageManager#VERIFICATION_REJECT}. * or {@link PackageManager#VERIFICATION_REJECT}.
* @throws SecurityException if the caller does not have the * @throws SecurityException if the caller does not have the
@@ -2517,7 +2517,7 @@ public abstract class PackageManager {
* will have no effect. * will have no effect.
* *
* @param id pending package identifier as passed via the * @param id pending package identifier as passed via the
* {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra * {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra.
* @param verificationCodeAtTimeout either * @param verificationCodeAtTimeout either
* {@link PackageManager#VERIFICATION_ALLOW} or * {@link PackageManager#VERIFICATION_ALLOW} or
* {@link PackageManager#VERIFICATION_REJECT}. If * {@link PackageManager#VERIFICATION_REJECT}. If