IBBS Support, ADB Over WiFi (WIP) and HALO 2 (inc fixes)

api/current.txt

@@ -13369,6 +13369,8 @@ package android.net.wifi {
     field public java.util.BitSet allowedPairwiseCiphers;
     field public java.util.BitSet allowedProtocols;
     field public boolean hiddenSSID;
+    field public boolean isIBSS;
+    field public int frequency;
     field public int networkId;
     field public java.lang.String preSharedKey;
     field public int priority;
@@ -13457,6 +13459,7 @@ package android.net.wifi {
     method public java.util.List<android.net.wifi.ScanResult> getScanResults();
     method public int getWifiState();
     method public boolean isWifiEnabled();
+    method public boolean isIbssSupported();
     method public boolean pingSupplicant();
     method public boolean reassociate();
     method public boolean reconnect();

core/java/android/provider/Settings.java

@@ -5569,6 +5569,12 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
         @Deprecated
         public static final String ADB_ENABLED = Global.ADB_ENABLED;
 
+        /**
+         * The TCP/IP port to run ADB on, or -1 for USB
+         * @hide
+         */
+        public static final String ADB_PORT = "adb_port";
+
         /**
          * Whether to display the ADB notification.
          * @hide

services/java/com/android/server/SystemServer.java

@@ -28,6 +28,8 @@
 import android.content.IntentFilter;
 import android.content.pm.IPackageManager;
 import android.content.res.Configuration;
+import android.database.ContentObserver;
+import android.database.Cursor;
 import android.media.AudioService;
 import android.net.wifi.p2p.WifiP2pService;
 import android.os.Handler;
@@ -40,6 +42,7 @@
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.server.search.SearchManagerService;
 import android.service.dreams.DreamService;
 import android.util.DisplayMetrics;
@@ -88,6 +91,19 @@ void reportWtf(String msg, Throwable e) {
         Log.wtf(TAG, "BOOT FAILURE " + msg, e);
     }
 
+    private class AdbPortObserver extends ContentObserver {
+        public AdbPortObserver() {
+            super(null);
+        }
+        @Override
+        public void onChange(boolean selfChange) {
+            int adbPort = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ADB_PORT, 0);
+            // setting this will control whether ADB runs on TCP/IP or USB
+            SystemProperties.set("service.adb.tcp.port", Integer.toString(adbPort));
+        }
+    }
+
     @Override
     public void run() {
         EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_SYSTEM_RUN,

services/java/com/android/server/usb/UsbDeviceManager.java

@@ -392,6 +392,10 @@ public void onChange(boolean selfChange) {
                         }
                 );
 
+                mContentResolver.registerContentObserver(
+                        Settings.Secure.getUriFor(Settings.Secure.ADB_PORT),
+                                false, new AdbSettingsObserver());
+
                 // Watch for USB configuration changes
                 mUEventObserver.startObserving(USB_STATE_MATCH);
                 mUEventObserver.startObserving(ACCESSORY_START_MATCH);