diff options
| author | jkarlin@chromium.org <jkarlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 20:47:09 +0000 |
|---|---|---|
| committer | jkarlin@chromium.org <jkarlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 20:47:09 +0000 |
| commit | 832679a6e97886d7681231c42a371d0a90e4880b (patch) | |
| tree | 7efc92fac91f100bc02e9223c8dda676dbd9c3e5 /net/android | |
| parent | a1f0c722f5eec45c6bcb210a04bac9db85f15428 (diff) | |
| download | chromium_src-832679a6e97886d7681231c42a371d0a90e4880b.zip chromium_src-832679a6e97886d7681231c42a371d0a90e4880b.tar.gz chromium_src-832679a6e97886d7681231c42a371d0a90e4880b.tar.bz2 | |
Support Bluetooth network connection type on Android.
BUG=378785
Review URL: https://codereview.chromium.org/301973002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
3 files changed, 4 insertions, 0 deletions
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java index 67c2c2b..476ff34 100644 --- a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java +++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java @@ -41,6 +41,7 @@ public class NetworkChangeNotifier { public static final int CONNECTION_3G = 4; public static final int CONNECTION_4G = 5; public static final int CONNECTION_NONE = 6; + public static final int CONNECTION_BLUETOOTH = 7; private final Context mContext; private final ArrayList<Long> mNativeChangeNotifiers; diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java index 6fa7f4f..5a46a6c 100644 --- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java +++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java @@ -163,6 +163,8 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver return NetworkChangeNotifier.CONNECTION_WIFI; case ConnectivityManager.TYPE_WIMAX: return NetworkChangeNotifier.CONNECTION_4G; + case ConnectivityManager.TYPE_BLUETOOTH: + return NetworkChangeNotifier.CONNECTION_BLUETOOTH; case ConnectivityManager.TYPE_MOBILE: // Use information from TelephonyManager to classify the connection. switch (mConnectivityManagerDelegate.getNetworkSubtype()) { diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc index 207f01b..fbbaced 100644 --- a/net/android/network_change_notifier_delegate_android.cc +++ b/net/android/network_change_notifier_delegate_android.cc @@ -23,6 +23,7 @@ NetworkChangeNotifier::ConnectionType ConvertConnectionType( case NetworkChangeNotifier::CONNECTION_3G: case NetworkChangeNotifier::CONNECTION_4G: case NetworkChangeNotifier::CONNECTION_NONE: + case NetworkChangeNotifier::CONNECTION_BLUETOOTH: break; default: NOTREACHED() << "Unknown connection type received: " << connection_type; |