diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:18:18 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:18:18 +0000 |
| commit | d7f8a558a86967f34fba0c276bd0fa272d8b8316 (patch) | |
| tree | d031f1e1c1c85d222610f711e7fd6a324b810693 /net/android | |
| parent | 650529630633df0f6296adc18647a615b38371fc (diff) | |
| download | chromium_src-d7f8a558a86967f34fba0c276bd0fa272d8b8316.zip chromium_src-d7f8a558a86967f34fba0c276bd0fa272d8b8316.tar.gz chromium_src-d7f8a558a86967f34fba0c276bd0fa272d8b8316.tar.bz2 | |
Use the main application context in NCNAutoDetect.
The main activity context was used to initialize NCNAutoDetect from the
application side. This was causing some unnecessary complexity due to its
lifetime management.
BUG=178185
Review URL: https://codereview.chromium.org/12811002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java index c544365..038cb31 100644 --- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java +++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java @@ -62,7 +62,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver private final Observer mObserver; - private Context mContext; + private final Context mContext; private ConnectivityManagerDelegate mConnectivityManagerDelegate; private boolean mRegistered; private int mConnectionType; @@ -76,7 +76,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver public NetworkChangeNotifierAutoDetect(Observer observer, Context context) { mObserver = observer; - mContext = context; + mContext = context.getApplicationContext(); mConnectivityManagerDelegate = new ConnectivityManagerDelegate(context); mConnectionType = getCurrentConnectionType(); ActivityStatus.registerStateListener(this); @@ -165,12 +165,6 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver // ActivityStatus.StateListener @Override public void onActivityStateChange(int state) { - Context context = ActivityStatus.getActivity(); - if (mContext != context && context != null) { - // Note that |context| can be null during testing. In this case |mContext| should not be - // overwritten. - mContext = context; - } if (state == ActivityStatus.RESUMED) { // Note that this also covers the case where the main activity is created. The CREATED // event is always followed by the RESUMED event. This is a temporary "hack" until |