diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-12-04 20:44:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 20:44:53 +0000 |
| commit | c22369be46346974165ef8f8256acdb768860518 (patch) | |
| tree | 8a8d1422a16167c25cb45a0bc91da735225a341b /core/java/android/content | |
| parent | 1a1b89485df96ab4d05eaac59e2d5681990acba3 (diff) | |
| parent | 3c8a439be33932f35b723271cec5cd4210c19221 (diff) | |
| download | frameworks_base-c22369be46346974165ef8f8256acdb768860518.zip frameworks_base-c22369be46346974165ef8f8256acdb768860518.tar.gz frameworks_base-c22369be46346974165ef8f8256acdb768860518.tar.bz2 | |
am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
Fix issue #17948584: Application crash and phone restart when app...
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 4 |
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)) { |