summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-12-04 20:23:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 20:23:25 +0000
commit3c8a439be33932f35b723271cec5cd4210c19221 (patch)
treeb08a36fdf4017c66cdd05ed136e39f8a66eef7a5 /core/java/android/content
parent979ed5140baf4e89d0aaaec39c0c2b8033c401bf (diff)
parente6333e5188fd4becf7dea286c768f55c3b89d63e (diff)
downloadframeworks_base-3c8a439be33932f35b723271cec5cd4210c19221.zip
frameworks_base-3c8a439be33932f35b723271cec5cd4210c19221.tar.gz
frameworks_base-3c8a439be33932f35b723271cec5cd4210c19221.tar.bz2
am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e': 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.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)) {