resolved conflicts for merge of 603f987f to jb-mr2-dev (24b8947f) · Commits · e / os / android_frameworks_base

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

+39 −39

Original line number	Diff line number	Diff line
		@@ -1301,8 +1301,8 @@ public abstract class PackageManager {
		* package is not found in the list of installed applications, the
		* package information is retrieved from the list of uninstalled
		* applications (which includes installed applications as well as
		* applications with data directory ie applications which had been
		* deleted with DONT_DELTE_DATA flag set).
		* applications with data directory i.e. applications which had been
		* deleted with {@code DONT_DELETE_DATA} flag set).
		* @see #GET_ACTIVITIES
		* @see #GET_GIDS
		* @see #GET_CONFIGURATIONS
		@@ -1470,7 +1470,7 @@ public abstract class PackageManager {
		* list of uninstalled applications(which includes
		* installed applications as well as applications
		* 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_SHARED_LIBRARY_FILES
		@@ -1589,7 +1589,7 @@ public abstract class PackageManager {
		* installed on the device. In the unlikely case of there being no
		* installed packages, an empty list is returned.
		* 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.
		*
		* @see #GET_ACTIVITIES
		@@ -1659,7 +1659,7 @@ public abstract class PackageManager {
		* installed on the device. In the unlikely case of there being no
		* installed packages, an empty list is returned.
		* 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.
		*
		* @see #GET_ACTIVITIES
		@@ -1887,7 +1887,7 @@ public abstract class PackageManager {
		/**
		* 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
		* 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.
		*
		* @param flags Additional option flags. Use any combination of
		@@ -1898,7 +1898,7 @@ public abstract class PackageManager {
		* is installed on the device. In the unlikely case of there being
		* no installed applications, an empty list is returned.
		* 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.
		*
		* @see #GET_META_DATA
		@@ -2449,7 +2449,7 @@ public abstract class PackageManager {
		*
		* @return Returns the label associated with this application, or null if
		* 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);

		@@ -2657,7 +2657,7 @@ public abstract class PackageManager {
		* {@link PackageManager#VERIFICATION_REJECT}.
		*
		* @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}
		* or {@link PackageManager#VERIFICATION_REJECT}.
		* @throws SecurityException if the caller does not have the
		@@ -2678,7 +2678,7 @@ public abstract class PackageManager {
		* will have no effect.
		*
		* @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
		* {@link PackageManager#VERIFICATION_ALLOW} or
		* {@link PackageManager#VERIFICATION_REJECT}. If