Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread

Browse Source
This commit is contained in:
Chris Palmer
2010-09-14 17:43:31 -07:00
committed by Android (Google) Code Review
parent 6457a28be8 09f3360f51
commit 5bade703fd
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/java/android/content/pm/PackageManager.java
View File

@@ -192,7 +192,7 @@ public abstract class PackageManager {
/**
* Signature check result: this is returned by {@link #checkSignatures}
* if the two packages have a matching signature.
* if all signatures on the two packages match.
*/
public static final int SIGNATURE_MATCH = 0;
@@ -204,25 +204,25 @@ public abstract class PackageManager {
/**
* Signature check result: this is returned by {@link #checkSignatures}
* if the first package is not signed, but the second is.
* if the first package is not signed but the second is.
*/
public static final int SIGNATURE_FIRST_NOT_SIGNED = -1;
/**
* Signature check result: this is returned by {@link #checkSignatures}
* if the second package is not signed, but the first is.
* if the second package is not signed but the first is.
*/
public static final int SIGNATURE_SECOND_NOT_SIGNED = -2;
/**
* Signature check result: this is returned by {@link #checkSignatures}
* if both packages are signed but there is no matching signature.
* if not all signatures on both packages match.
*/
public static final int SIGNATURE_NO_MATCH = -3;
/**
* Signature check result: this is returned by {@link #checkSignatures}
* if either of the given package names are not valid.
* if either of the packages are not valid.
*/
public static final int SIGNATURE_UNKNOWN_PACKAGE = -4;
@@ -1230,20 +1230,14 @@ public abstract class PackageManager {
*
* @param pkg1 First package name whose signature will be compared.
* @param pkg2 Second package name whose signature will be compared.
* @return Returns an integer indicating whether there is a matching
* signature: the value is >= 0 if there is a match (or neither package
* is signed), or < 0 if there is not a match. The match result can be
* further distinguished with the success (>= 0) constants
* {@link #SIGNATURE_MATCH}, {@link #SIGNATURE_NEITHER_SIGNED}; or
* failure (< 0) constants {@link #SIGNATURE_FIRST_NOT_SIGNED},
* {@link #SIGNATURE_SECOND_NOT_SIGNED}, {@link #SIGNATURE_NO_MATCH},
* or {@link #SIGNATURE_UNKNOWN_PACKAGE}.
*
* @return Returns an integer indicating whether all signatures on the
* two packages match. The value is >= 0 ({@link #SIGNATURE_MATCH}) if
* all signatures match or < 0 if there is not a match ({@link
* #SIGNATURE_NO_MATCH} or {@link #SIGNATURE_UNKNOWN_PACKAGE}).
*
* @see #checkSignatures(int, int)
* @see #SIGNATURE_MATCH
* @see #SIGNATURE_NEITHER_SIGNED
* @see #SIGNATURE_FIRST_NOT_SIGNED
* @see #SIGNATURE_SECOND_NOT_SIGNED
* @see #SIGNATURE_NO_MATCH
* @see #SIGNATURE_UNKNOWN_PACKAGE
*/
@@ -1258,20 +1252,14 @@ public abstract class PackageManager {
*
* @param uid1 First UID whose signature will be compared.
* @param uid2 Second UID whose signature will be compared.
* @return Returns an integer indicating whether there is a matching
* signature: the value is >= 0 if there is a match (or neither package
* is signed), or < 0 if there is not a match. The match result can be
* further distinguished with the success (>= 0) constants
* {@link #SIGNATURE_MATCH}, {@link #SIGNATURE_NEITHER_SIGNED}; or
* failure (< 0) constants {@link #SIGNATURE_FIRST_NOT_SIGNED},
* {@link #SIGNATURE_SECOND_NOT_SIGNED}, {@link #SIGNATURE_NO_MATCH},
* or {@link #SIGNATURE_UNKNOWN_PACKAGE}.
*
* @see #checkSignatures(int, int)
* @return Returns an integer indicating whether all signatures on the
* two packages match. The value is >= 0 ({@link #SIGNATURE_MATCH}) if
* all signatures match or < 0 if there is not a match ({@link
* #SIGNATURE_NO_MATCH} or {@link #SIGNATURE_UNKNOWN_PACKAGE}).
*
* @see #checkSignatures(String, String)
* @see #SIGNATURE_MATCH
* @see #SIGNATURE_NEITHER_SIGNED
* @see #SIGNATURE_FIRST_NOT_SIGNED
* @see #SIGNATURE_SECOND_NOT_SIGNED
* @see #SIGNATURE_NO_MATCH
* @see #SIGNATURE_UNKNOWN_PACKAGE
*/