summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2010-12-16 11:27:38 -0800
committerRobert Greenwalt <rgreenwalt@google.com>2010-12-16 11:35:40 -0800
commit81d5ad515a9379432b2907aa9bcc830303202c84 (patch)
tree1170631d792c9a3a63c226574fbd3e397377c99b
parentf76aca984c4754e4de2cd731d5b6bbdb169b7544 (diff)
downloadframeworks_base-81d5ad515a9379432b2907aa9bcc830303202c84.zip
frameworks_base-81d5ad515a9379432b2907aa9bcc830303202c84.tar.gz
frameworks_base-81d5ad515a9379432b2907aa9bcc830303202c84.tar.bz2
Fix Bluetooth-tethering config of interface.
bug:3288692 Change-Id: Id7f1b680392f938000953157716bf9a8f8a66af9
-rw-r--r--core/java/android/server/BluetoothService.java3
-rw-r--r--services/java/com/android/server/NetworkManagementService.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 9e5abdc..d197341 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1662,7 +1662,8 @@ public class BluetoothService extends IBluetooth.Stub {
ifcg = service.getInterfaceConfig(iface);
if (ifcg != null) {
ifcg.mask = InetAddress.getByName(BLUETOOTH_NETMASK);
- if (ifcg.addr == null) {
+
+ if (ifcg.addr == null || ifcg.addr.equals(InetAddress.getByName("0.0.0.0"))) {
ifcg.addr = InetAddress.getByName(address);
ifcg.interfaceFlags = ifcg.interfaceFlags.replace("down", "up");
}
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index 4290ce7..152605f 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -295,7 +295,7 @@ class NetworkManagementService extends INetworkManagementService.Stub {
mConnector.doCommand(cmd);
} catch (NativeDaemonConnectorException e) {
throw new IllegalStateException(
- "Unable to communicate with native daemon to interface setcfg");
+ "Unable to communicate with native daemon to interface setcfg - " + e);
}
}