am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
WifiP2pWfdInfo set device type bugfix
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 2aff5f2..70c8750 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -929,23 +929,6 @@
}
/**
- * Get the set of tethered dhcp ranges.
- *
- * @return an array of 0 or more Strings of tethered dhcp ranges.
- *
- * <p>This method requires the call to hold the permission
- * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
- * {@hide}
- */
- public String[] getTetheredDhcpRanges() {
- try {
- return mService.getTetheredDhcpRanges();
- } catch (RemoteException e) {
- return new String[0];
- }
- }
-
- /**
* Get the set of tethered interfaces.
*
* @return an array of 0 or more String of currently tethered interface names.
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 3bfd88e..4bca7fe 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -91,8 +91,6 @@
String[] getTetherableIfaces();
- String[] getTetheredDhcpRanges();
-
String[] getTetheredIfaces();
String[] getTetheringErroredIfaces();
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 2d1921e..b7a1a55 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3297,11 +3297,6 @@
return mTethering.getTetherableIfaces();
}
- public String[] getTetheredDhcpRanges() {
- enforceConnectivityInternalPermission();
- return mTethering.getTetheredDhcpRanges();
- }
-
public String[] getTetheredIfaces() {
enforceTetherAccessPermission();
return mTethering.getTetheredIfaces();
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index 91b9b07..adf1dfc 100644
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -109,7 +109,6 @@
// USB is 192.168.42.1 and 255.255.255.0
// Wifi is 192.168.43.1 and 255.255.255.0
- // P2P is 192.168.49.1 and 255.255.255.0
// BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
// with 255.255.255.0
@@ -118,7 +117,7 @@
"192.168.42.2", "192.168.42.254", "192.168.43.2", "192.168.43.254",
"192.168.44.2", "192.168.44.254", "192.168.45.2", "192.168.45.254",
"192.168.46.2", "192.168.46.254", "192.168.47.2", "192.168.47.254",
- "192.168.48.2", "192.168.48.254", "192.168.49.2", "192.168.49.254",
+ "192.168.48.2", "192.168.48.254",
};
private String[] mDefaultDnsServers;
@@ -700,10 +699,6 @@
return retVal;
}
- public String[] getTetheredDhcpRanges() {
- return mDhcpRange;
- }
-
public String[] getErroredIfaces() {
ArrayList<String> list = new ArrayList<String>();
synchronized (mPublicSync) {
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk
index 258d9b3..5d03842 100644
--- a/tools/layoutlib/Android.mk
+++ b/tools/layoutlib/Android.mk
@@ -53,7 +53,6 @@
$(LOCAL_BUILT_MODULE): $(built_core_dep) \
$(built_framework_dep) \
$(built_ext_dep) \
- $(built_ext_data) \
$(built_layoutlib_create_jar)
$(hide) echo "host layoutlib_create: $@"
$(hide) mkdir -p $(dir $@)
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
index a38f234..8b07208 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@ -109,7 +109,6 @@
INetworkManagementService mNwService;
private DhcpStateMachine mDhcpStateMachine;
- private ConnectivityManager mCm;
private P2pStateMachine mP2pStateMachine;
private AsyncChannel mReplyChannel = new AsyncChannel();
@@ -227,6 +226,9 @@
/* clients(application) information list. */
private HashMap<Messenger, ClientInfo> mClientInfoList = new HashMap<Messenger, ClientInfo>();
+ /* Is chosen as a unique range to avoid conflict with
+ the range defined in Tethering.java */
+ private static final String[] DHCP_RANGE = {"192.168.49.2", "192.168.49.254"};
private static final String SERVER_ADDRESS = "192.168.49.1";
/**
@@ -2056,15 +2058,8 @@
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
}
- private void checkAndSetConnectivityInstance() {
- if (mCm == null) {
- mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
- }
- }
-
private void startDhcpServer(String intf) {
InterfaceConfiguration ifcg = null;
- checkAndSetConnectivityInstance();
try {
ifcg = mNwService.getInterfaceConfig(intf);
ifcg.setLinkAddress(new LinkAddress(NetworkUtils.numericToInetAddress(
@@ -2072,30 +2067,17 @@
ifcg.setInterfaceUp();
mNwService.setInterfaceConfig(intf, ifcg);
/* This starts the dnsmasq server */
- String[] tetheringDhcpRanges = mCm.getTetheredDhcpRanges();
- if (mNwService.isTetheringStarted()) {
- if (DBG) logd("Stop exist tethering and will restart it");
- mNwService.stopTethering();
- mNwService.tetherInterface(intf);
- }
- mNwService.startTethering(tetheringDhcpRanges);
+ mNwService.startTethering(DHCP_RANGE);
} catch (Exception e) {
loge("Error configuring interface " + intf + ", :" + e);
return;
}
+
logd("Started Dhcp server on " + intf);
}
private void stopDhcpServer(String intf) {
try {
- for (String temp : mNwService.listTetheredInterfaces()) {
- logd("List all interfaces " + temp);
- if (temp.compareTo(intf) != 0 ) {
- logd("Found other tethering interface so keep tethering alive");
- mNwService.untetherInterface(intf);
- return;
- }
- }
mNwService.stopTethering();
} catch (Exception e) {
loge("Error stopping Dhcp server" + e);