summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-12-03 21:32:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-03 21:32:17 +0000
commitf696efa206089bde1274d972239ffb5a8185f613 (patch)
tree36c3a3a586a00bc07aaf2af3eae9a9728468f6bb /core/java/android
parentd3adf0986ba53b794ac8f8b70a8784ca6945d4ba (diff)
parent1bc177c58550514c6e48d74061392b4247a9bf6a (diff)
Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageParser.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 82da7c540d73..d7d9e8bf6a4e 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3528,6 +3528,10 @@ public class PackageParser {
outError[0] = "<provider> does not include authorities attribute";
return null;
}
+ if (cpname.length() <= 0) {
+ outError[0] = "<provider> has empty authorities attribute";
+ return null;
+ }
p.info.authority = cpname.intern();
if (!parseProviderTags(res, parser, attrs, p, outError)) {