summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kersey <kerz@google.com>2015-04-10 18:10:22 -0700
committerJason Kersey <kerz@google.com>2015-04-11 01:12:30 +0000
commite0ae42923d084d494997d0eead534527a6e6e7e7 (patch)
tree5eb22f5f33c247e56d60ceb7e6ae810b2a1470b3
parent52c6c3124ac605fa5fd9513d0e3feec9e302fec9 (diff)
downloadchromium_src-e0ae42923d084d494997d0eead534527a6e6e7e7.zip
chromium_src-e0ae42923d084d494997d0eead534527a6e6e7e7.tar.gz
chromium_src-e0ae42923d084d494997d0eead534527a6e6e7e7.tar.bz2
Dont use activity as context to PrivacyPreferencesManager
This manager is an app level object that holds onto the context sent to it. Sending FirstRunActivity makes us leak the activity. This plugs the case which sends the activity and also makes sure the manager always takes the application context. BUG=476109 Review URL: https://codereview.chromium.org/1079743002 (cherry picked from commit 81557600988825aa7412383b86a8f9e079897631) Cr-Original-Commit-Position: refs/heads/master@{#324732} Cr-Commit-Position: refs/branch-heads/2311@{#476} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
index e42e855..659e4ea 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
@@ -53,7 +53,7 @@ public class PrivacyPreferencesManager {
public static PrivacyPreferencesManager getInstance(Context context) {
if (sInstance == null) {
- sInstance = new PrivacyPreferencesManager(context);
+ sInstance = new PrivacyPreferencesManager(context.getApplicationContext());
}
return sInstance;
}