Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

2014-12-03 21:32:15 +00:00
parent d3adf0986b 1bc177c585
commit f696efa206
1 changed files with 4 additions and 0 deletions
--- 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)) {