am 24fa6aa6: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev

* commit '24fa6aa6d9d04fc0cde8febb8eb46f731712542f':
  Expose WifiManager.setTdlsEnabled public API
This commit is contained in:
Vinit Deshapnde
2013-08-19 12:19:15 -07:00
committed by Android Git Automerger

View File

@@ -504,9 +504,9 @@ public class Connectivity extends Activity {
InetAddress inetAddress = null;
try {
inetAddress = InetAddress.getByName(mTdlsAddr);
mWm.enableTdls(inetAddress, true);
mWm.setTdlsEnabled(inetAddress, true);
} catch (Exception e) {
mWm.enableTdlsWithMacAddress(mTdlsAddr, true);
mWm.setTdlsEnabledWithMacAddress(mTdlsAddr, true);
}
}
@@ -516,9 +516,9 @@ public class Connectivity extends Activity {
InetAddress inetAddress = null;
try {
inetAddress = InetAddress.getByName(mTdlsAddr);
mWm.enableTdls(inetAddress, false);
mWm.setTdlsEnabled(inetAddress, false);
} catch (Exception e) {
mWm.enableTdlsWithMacAddress(mTdlsAddr, false);
mWm.setTdlsEnabledWithMacAddress(mTdlsAddr, false);
}
}