From bb5a3901428b1caeb1014d7423467cbdc0ad96f2 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Mon, 1 Aug 2016 15:01:08 -0700
Subject: [PATCH] AAPT2: Allow <intent-filter> within <provider> in
 AndroidManifest.xml

Change-Id: I005120b76679f51039ddc40160c96ead6ab5fa4f
---
 tools/aapt2/link/ManifestFixer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index ef095357d9e62..1203db7734ead 100644
--- 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;
 }