commit ed791da741064a51080ec775001cf843ba6a3143
author Vivek Sekhar <vsekhar@codeaurora.org> Sun Feb 22 12:39:05 2015 -0800
committer Pankaj Garg <pgarg@codeaurora.org> Tue Mar 10 18:59:53 2015 -0700
tree ec3a08e5daab327bb657f6cb4e1c9a9808defaff
parent 06cd42fa8ed24a0755a49d680e4da74ada2d18d5

M42 snap browser

Change-Id: If52741ad5e34241aa9f928244942a33a91610e58

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 9ba3c31..5bb085c 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -258,8 +258,6 @@
         settings.setUseWideViewPort(isWideViewport());
         settings.setDoNotTrack(doNotTrack());
         settings.setMediaPlaybackRequiresUserGesture(false);
-        settings.setAllowMediaDownloads(allowMediaDownloads());
-        setExtraHTTPRequestHeaders(settings);
 
         WebSettings settingsClassic = (WebSettings) settings;
         settingsClassic.setHardwareAccelSkiaEnabled(isSkiaHardwareAccelerated());
@@ -284,12 +282,6 @@
         settingsClassic.setLinkPrefetchEnabled(mLinkPrefetchAllowed);
     }
 
-    private void setExtraHTTPRequestHeaders(WebSettings settings){
-        String headers = mContext.getResources().getString(R.string.def_extra_http_headers);
-        if (!TextUtils.isEmpty(headers)){
-            settings.setHTTPRequestHeaders(headers);
-        }
-    }
 
     /**
      * Syncs all the settings that have no UI
@@ -343,6 +335,7 @@
     private void syncSharedSettings() {
         mNeedsSharedSync = false;
         CookieManager.getInstance().setAcceptCookie(acceptCookies());
+
     }
 
     private void syncManagedSettings() {
@@ -731,25 +724,6 @@
         return mPrefs.getBoolean(PREF_ENABLE_MEMORY_MONITOR, true);
     }
 
-    public boolean allowMediaDownloads() {
-        // Return false if preference is not exposed to user
-        if (!BrowserConfig.getInstance(mContext)
-                .hasFeature(BrowserConfig.Feature.ALLOW_MEDIA_DOWNLOADS))
-            return false;
-
-        // Otherwise, look at default value
-        boolean defaultAllowMediaDownloadsValue = mController.getContext()
-                .getResources().getBoolean(R.bool.def_allow_media_downloads);
-
-        // If preference is not saved, save default value
-        if (!mPrefs.contains(PREF_ALLOW_MEDIA_DOWNLOADS)){
-            Editor edit = mPrefs.edit();
-            edit.putBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue);
-            edit.apply();
-        }
-
-        return mPrefs.getBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue);
-    }
 
     public boolean loadPageInOverviewMode() {
         return mPrefs.getBoolean(PREF_LOAD_PAGE, true);