summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-08-02 12:33:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-02 12:33:40 -0700
commit739cdab7cb63d53440bb411fa2d558e2114b4c81 (patch)
treed51390327a6d9de2fc7ef118a403b07393ddf4a6 /core
parent1540a7ea1afcb772b5fcf90f635153f6489eb8ed (diff)
parent930d3af75f9e9663222f4c4a1d75b326cf811e35 (diff)
downloadframeworks_base-739cdab7cb63d53440bb411fa2d558e2114b4c81.zip
frameworks_base-739cdab7cb63d53440bb411fa2d558e2114b4c81.tar.gz
frameworks_base-739cdab7cb63d53440bb411fa2d558e2114b4c81.tar.bz2
Merge "Do not deference before null check" into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/PackageParser.java2
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;