commit 36165a676a2c742cc049f738795adced39449255
author Robert Greenwalt <rgreenwalt@google.com> Sat Jan 29 06:55:38 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 29 06:55:38 2011 -0800
tree 77f38e3b0e660c2db45ee305636d641834a98acf
parent 08df90cf802172658dc54f09484d83eb080a46cf
parent 9d07781cb64ff5f2e9840127a5c1ff374e71a8d5

am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread

* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 1cfe419..a43914a 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -212,6 +212,15 @@
      * default connections.
      */
     public static final int TYPE_WIMAX       = 6;
+    /**
+     * Bluetooth data connection.
+     * @hide
+     */
+    public static final int TYPE_BLUETOOTH   = 7;
+    /** {@hide} */
+    public static final int TYPE_DUMMY       = 8;
+    /** {@hide} */
+    public static final int TYPE_ETHERNET    = 9;
     /** {@hide} TODO: Need to adjust this for WiMAX. */
     public static final int MAX_RADIO_TYPE   = TYPE_WIFI;
     /** {@hide} TODO: Need to adjust this for WiMAX. */