commit 79f962047bedfbc432264d517a89c48e5a6de3b4
author Adam Lesinski <adamlesinski@google.com> Tue Apr 25 15:37:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 15:37:36 2017 +0000
tree 4bd624b548e16c41e737a5aa2dca8bbb7df7b08e
parent 75f22837575eaaeeee0eb86fb042b41d918aad9b
parent 706b85e855d76f8cb0aaaefa4a35a9bdc3653343

Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev am: 7beb895d75
am: 706b85e855

Change-Id: I7ae22f1f7dd0736ca83261bc6efae5543c560c59

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 0c19c7a..27ab22b 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -333,7 +333,7 @@
   // 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;
 }