AAPT2: Allow <intent-filter> within <provider> in AndroidManifest.xml

Change-Id: I005120b76679f51039ddc40160c96ead6ab5fa4f
2016-08-01 15:01:08 -07:00
parent fd7daabf73
commit bb5a390142
1 changed files with 3 additions and 1 deletions
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -211,9 +211,11 @@ bool ManifestFixer::buildRules(xml::XmlActionExecutor* executor, IDiagnostics* d

    // Provider actions.
    applicationAction["provider"].action(requiredNameIsJavaClassName);
-    applicationAction["provider"]["grant-uri-permissions"];
+    applicationAction["provider"]["intent-filter"] = intentFilterAction;
    applicationAction["provider"]["meta-data"] = metaDataAction;
+    applicationAction["provider"]["grant-uri-permissions"];
    applicationAction["provider"]["path-permissions"];
+
    return true;
 }