commit bb5a3901428b1caeb1014d7423467cbdc0ad96f2
author Adam Lesinski <adamlesinski@google.com> Mon Aug 01 15:01:08 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Aug 01 15:01:08 2016 -0700
tree 0cb3dbf4cdd415b2f1147b2cca4a98e81cf51361
parent fd7daabf738bca821232143c4e9dc9384c044383

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

Change-Id: I005120b76679f51039ddc40160c96ead6ab5fa4f

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index ef09535..1203db7 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -211,9 +211,11 @@
 
     // 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;
 }