diff options
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 0670c4e620e0..2f96782b4e36 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1629,6 +1629,11 @@ public class WebSettings { /* package */ synchronized void setPrivateBrowsingEnabled(boolean flag) { if (mPrivateBrowsingEnabled != flag) { mPrivateBrowsingEnabled = flag; + + // AutoFill is dependant on private browsing being enabled so + // reset it to take account of the new value of mPrivateBrowsingEnabled. + setAutoFillEnabled(mAutoFillEnabled); + postSync(); } } @@ -1644,8 +1649,10 @@ public class WebSettings { * @hide */ public synchronized void setAutoFillEnabled(boolean enabled) { - if (mAutoFillEnabled != enabled) { - mAutoFillEnabled = enabled; + // AutoFill is always disabled in private browsing mode. + boolean autoFillEnabled = enabled && !mPrivateBrowsingEnabled; + if (mAutoFillEnabled != autoFillEnabled) { + mAutoFillEnabled = autoFillEnabled; postSync(); } } |