53 lines
3.1 KiB
Diff
53 lines
3.1 KiB
Diff
commit 6a6024067d27a53fb58af282580da68f6cea8809
|
|
Author: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Fri Oct 27 15:53:37 2017 +0200
|
|
|
|
Ported data reduction disable patch
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
|
index ccc8517..5c69672 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
|
@@ -144,7 +144,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
|
|
boolean notifyAdapter = false;
|
|
// An optional Data Saver page.
|
|
if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
|
|
- mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
|
|
+ //mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
|
|
mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
|
|
notifyAdapter = true;
|
|
}
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
|
index 822f642..06e91a5 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
|
@@ -156,6 +156,7 @@ public class DataReductionProxySettings {
|
|
// DataReductionProxySettings is a singleton that lives forever and there's no clean
|
|
// shutdown of Chrome on Android
|
|
mNativeDataReductionProxySettings = nativeInit();
|
|
+ nativeSetDataReductionProxyEnabled(mNativeDataReductionProxySettings, false);
|
|
}
|
|
|
|
/** Returns true if the SPDY proxy promo is allowed to be shown. */
|
|
@@ -178,6 +179,7 @@ public class DataReductionProxySettings {
|
|
* data reduction statistics if this is the first time the SPDY proxy has been enabled.
|
|
*/
|
|
public void setDataReductionProxyEnabled(Context context, boolean enabled) {
|
|
+ enabled = false;
|
|
if (enabled
|
|
&& ContextUtils.getAppSharedPreferences().getLong(
|
|
DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
|
index bd42c89..b147765 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
|
@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
|
|
}
|
|
if (DataReductionProxySettings.getInstance().isDataReductionProxyManaged()) return false;
|
|
if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) return false;
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
/**
|