diff options
author | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 01:40:59 +0000 |
---|---|---|
committer | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 01:40:59 +0000 |
commit | 8d790d6a43fed99c3614634410f226f8497f30bc (patch) | |
tree | a6cbaccaee42a87d62e8ec0ab52f221f75ac59e8 /net/android | |
parent | d6926ad514aca2dd44fec0f922cc7d2ba73f25d4 (diff) | |
download | chromium_src-8d790d6a43fed99c3614634410f226f8497f30bc.zip chromium_src-8d790d6a43fed99c3614634410f226f8497f30bc.tar.gz chromium_src-8d790d6a43fed99c3614634410f226f8497f30bc.tar.bz2 |
Upstream singleton consolidation in NetworkChangeNotifier
Cherry-pick: https://gerrit-int.chromium.org/#/c/25876/
BUG=136984
Review URL: https://chromiumcodereview.appspot.com/11060012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
-rw-r--r-- | net/android/java/src/org/chromium/net/NetworkChangeNotifier.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java index 63a41c6..a8c21a6 100644 --- a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java +++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java @@ -100,8 +100,7 @@ public class NetworkChangeNotifier { public static void setAutoDetectConnectivityState(boolean shouldAutoDetect) { // We should only get a call to this after the native object is created and // hence the singleton initialised. - assert sInstance != null; - sInstance.setAutoDetectConnectivityStateInternal(shouldAutoDetect); + getInstance().setAutoDetectConnectivityStateInternal(shouldAutoDetect); } private void destroyAutoDetector() { @@ -137,9 +136,8 @@ public class NetworkChangeNotifier { */ @CalledByNative public static void forceConnectivityState(boolean networkAvailable) { - assert sInstance != null; setAutoDetectConnectivityState(false); - sInstance.forceConnectivityStateInternal(networkAvailable); + getInstance().forceConnectivityStateInternal(networkAvailable); } private void forceConnectivityStateInternal(boolean forceOnline) { @@ -171,8 +169,7 @@ public class NetworkChangeNotifier { * Adds an observer for any connection type changes. */ public static void addConnectionTypeObserver(ConnectionTypeObserver observer) { - assert sInstance != null; - sInstance.addConnectionTypeObserverInternal(observer); + getInstance().addConnectionTypeObserverInternal(observer); } private void addConnectionTypeObserverInternal(ConnectionTypeObserver observer) { @@ -184,8 +181,7 @@ public class NetworkChangeNotifier { * Removes an observer for any connection type changes. */ public static boolean removeConnectionTypeObserver(ConnectionTypeObserver observer) { - assert sInstance != null; - return sInstance.removeConnectionTypeObserverInternal(observer); + return getInstance().removeConnectionTypeObserverInternal(observer); } private boolean removeConnectionTypeObserverInternal(ConnectionTypeObserver observer) { @@ -201,7 +197,6 @@ public class NetworkChangeNotifier { // For testing only. public static NetworkChangeNotifierAutoDetect getAutoDetectorForTest() { - assert sInstance != null; - return sInstance.mAutoDetector; + return getInstance().mAutoDetector; } } |