diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2013-07-18 14:24:39 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-07-18 16:32:30 -0700 |
commit | 47a5a18431a9fd7256f4a53a9d845fd2ab5bba3a (patch) | |
tree | 57c1fac9f298da267b2af24358bb2e112d75fd3f | |
parent | b1fc86ddc34caa39a1e7e347693f233a47ae22d4 (diff) | |
download | android_development-47a5a18431a9fd7256f4a53a9d845fd2ab5bba3a.tar.gz android_development-47a5a18431a9fd7256f4a53a9d845fd2ab5bba3a.tar.bz2 android_development-47a5a18431a9fd7256f4a53a9d845fd2ab5bba3a.zip |
Connectivity: Add TDLS test
Bug: 8539031
Change-Id: I68e9e2e93d49f29ed915a462570cb8e782e9a4f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r-- | apps/Development/res/layout/connectivity.xml | 27 | ||||
-rw-r--r-- | apps/Development/res/values/strings.xml | 4 | ||||
-rw-r--r-- | apps/Development/src/com/android/development/Connectivity.java | 23 |
3 files changed, 54 insertions, 0 deletions
diff --git a/apps/Development/res/layout/connectivity.xml b/apps/Development/res/layout/connectivity.xml index 2df645ccf..53f1ed7ef 100644 --- a/apps/Development/res/layout/connectivity.xml +++ b/apps/Development/res/layout/connectivity.xml @@ -213,6 +213,33 @@ <LinearLayout android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/startTdls" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start_tdls" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/mac_tdls" /> + <EditText android:id="@+id/sc_ip_mac" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minEms="10" /> + <Button android:id="@+id/stopTdls" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/stop_tdls" /> + </LinearLayout> + + <!-- divider line --> + <View android:background="#FFFFFFFF" + android:layout_width="match_parent" + android:layout_height="3dip" /> + + <LinearLayout + android:orientation="horizontal" android:paddingTop="4dip" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml index b7ed5e12e..dc36859aa 100644 --- a/apps/Development/res/values/strings.xml +++ b/apps/Development/res/values/strings.xml @@ -34,6 +34,10 @@ <string name="scan_cycles">Scan Cycles: </string> <string name="disconnect">Disconnect</string> + <string name="start_tdls">Start TDLS</string> + <string name="stop_tdls">Stop TDLS</string> + <string name="mac_tdls"> MAC: </string> + <string name="start_mms">Start MMS</string> <string name="stop_mms">Stop MMS</string> <string name="start_hipri">Start HiPri</string> diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java index 63f23ae3d..12fa24a8e 100644 --- a/apps/Development/src/com/android/development/Connectivity.java +++ b/apps/Development/src/com/android/development/Connectivity.java @@ -117,6 +117,8 @@ public class Connectivity extends Activity { private long mTotalScanTime = 0; private long mTotalScanCount = 0; + private String mTdlsAddr = null; + private WifiManager mWm; private PowerManager mPm; private ConnectivityManager mCm; @@ -290,6 +292,9 @@ public class Connectivity extends Activity { mIntentFilter = new IntentFilter(); mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); + findViewById(R.id.startTdls).setOnClickListener(mClickListener); + findViewById(R.id.stopTdls).setOnClickListener(mClickListener); + findViewById(R.id.start_mms).setOnClickListener(mClickListener); findViewById(R.id.stop_mms).setOnClickListener(mClickListener); findViewById(R.id.start_hipri).setOnClickListener(mClickListener); @@ -339,6 +344,12 @@ public class Connectivity extends Activity { case R.id.startScan: onStartScanCycle(); break; + case R.id.startTdls: + onStartTdls(); + break; + case R.id.stopTdls: + onStopTdls(); + break; case R.id.start_mms: mCm.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_MMS); @@ -487,6 +498,18 @@ public class Connectivity extends Activity { } } + private void onStartTdls() { + mTdlsAddr = ((EditText)findViewById(R.id.sc_ip_mac)).getText().toString(); + Log.d(TAG, "TDLS: START " + mTdlsAddr); + mWm.enableTdlsWithMacAddress(mTdlsAddr, true); + } + + private void onStopTdls() { + if (mTdlsAddr == null) return; + Log.d(TAG, "TDLS: STOP " + mTdlsAddr); + mWm.enableTdlsWithMacAddress(mTdlsAddr, false); + } + private void onAddDefaultRoute() { try { mNetd.addRoute("eth0", new RouteInfo(null, |