Fix for when flash loads cached crossdomain.xml files.

Cache the x-permitted-cross-domain-policies header.
http://b/issue?id=2519669

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index 4f680e557013..d19805e6a8c8 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -99,6 +99,7 @@ public final class CacheManager {
         String location;
         String encoding;
         String contentdisposition;
+        String crossDomain;
 
         // these fields are NOT saved to the database
         InputStream inStream;
@@ -733,6 +734,11 @@ public final class CacheManager {
             ret.contentdisposition = contentDisposition;
         }
 
+        String crossDomain = headers.getXPermittedCrossDomainPolicies();
+        if (crossDomain != null) {
+            ret.crossDomain = crossDomain;
+        }
+
         // lastModified and etag may be set back to http header. So they can't
         // be empty string.
         String lastModified = headers.getLastModified();