diff options
| author | Kenny Root <kroot@google.com> | 2010-08-02 13:29:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-02 13:29:01 -0700 |
| commit | 59d4a5369cd68d4b65809ded407611b62b013f9a (patch) | |
| tree | db289ef88f805e09cd5fb1f642d1ec88addb1fdd /core | |
| parent | 7472c219a13e3f9f74d9a4adf1478e9c4f9248a2 (diff) | |
| parent | 739cdab7cb63d53440bb411fa2d558e2114b4c81 (diff) | |
| download | frameworks_base-59d4a5369cd68d4b65809ded407611b62b013f9a.zip frameworks_base-59d4a5369cd68d4b65809ded407611b62b013f9a.tar.gz frameworks_base-59d4a5369cd68d4b65809ded407611b62b013f9a.tar.bz2 | |
am 739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp
* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
Do not deference before null check
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 73c4011..0b35d8b 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -587,7 +587,7 @@ public class PackageParser { * location from the apk location at the given file path. * @param packageFilePath file location of the apk * @param flags Special parse flags - * @return PackageLite object with package information. + * @return PackageLite object with package information or null on failure. */ public static PackageLite parsePackageLite(String packageFilePath, int flags) { XmlResourceParser parser = null; |