diff options
| author | Kenny Root <kroot@google.com> | 2010-08-02 13:31:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-02 13:31:41 -0700 |
| commit | b0289f62af77a2811b4528fe284aad871e3c6b31 (patch) | |
| tree | 32108a844de9f1ab7712e2be5ec51a3aa0c73e68 /core/java | |
| parent | ae2036a8f9365cec0f343f2668424e8e964a971c (diff) | |
| parent | 59d4a5369cd68d4b65809ded407611b62b013f9a (diff) | |
| download | frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.zip frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.tar.gz frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.tar.bz2 | |
am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a'
* commit '59d4a5369cd68d4b65809ded407611b62b013f9a':
Do not deference before null check
Diffstat (limited to 'core/java')
| -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 8e93855..bc78d37 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; |