Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev

am: 7beb895d75 Change-Id: I7c426e4e8eb6187d044069c577ae68b1af41ea1e
2017-04-25 15:30:55 +00:00
parent 59c65a8a84 7beb895d75
commit 706b85e855
1 changed files with 1 additions and 1 deletions
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -333,7 +333,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
  // Provider actions.
  application_action["provider"] = component_action;
  application_action["provider"]["grant-uri-permissions"];
-  application_action["provider"]["path-permissions"];
+  application_action["provider"]["path-permission"];

  return true;
 }