summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-12-03 10:20:30 -0800
committerDianne Hackborn <hackbod@google.com>2014-12-03 10:20:30 -0800
commit1bc177c58550514c6e48d74061392b4247a9bf6a (patch)
tree89382f52fe22192be10bbf41fd83e9f31dd08405 /core/java/android/content
parent76de89820c51c4bc288b440a82374b9d6c806244 (diff)
downloadframeworks_base-1bc177c58550514c6e48d74061392b4247a9bf6a.zip
frameworks_base-1bc177c58550514c6e48d74061392b4247a9bf6a.tar.gz
frameworks_base-1bc177c58550514c6e48d74061392b4247a9bf6a.tar.bz2
Fix issue #17948584: Application crash and phone restart when app...
...is installed with <provider> with empty string. Don't allow empty authorities, just like we don't allow null authorities. Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
Diffstat (limited to 'core/java/android/content')
-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 82da7c5..d7d9e8b 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)) {