Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev

Browse Source 
* commit 'b32a80425db68f67ecafb89093e01e7c1d75770b':
  Use setAirplaneMode() API for Connectivity Manager tests
This commit is contained in:
Xia Wang
2013-09-11 17:26:09 -07:00
committed by Android Git Automerger
parent 5481e5fe30 b32a80425d
commit 6c2ad7ac97
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/ConnectivityManagerTest/AndroidManifest.xml
View File

@@ -79,6 +79,8 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<!-- This permission is added for API call setAirplaneMode() in ConnectivityManager -->
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

15
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
View File

@@ -651,19 +651,6 @@ public class ConnectivityManagerTestActivity extends Activity {
} catch (InterruptedException e) {}
}
/**
* Set airplane mode
*/
public void setAirplaneMode(Context context, boolean enableAM) {
//set the airplane mode
Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON,
enableAM ? 1 : 0);
// Post the intent
Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
intent.putExtra("state", enableAM);
context.sendBroadcastAsUser(intent, UserHandle.ALL);
}
protected static String convertToQuotedString(String string) {
return "\"" + string + "\"";
}
@@ -694,7 +681,7 @@ public class ConnectivityManagerTestActivity extends Activity {
//A thread to set the device into airplane mode then turn on wifi.
Thread setDeviceWifiAndAirplaneThread = new Thread(new Runnable() {
public void run() {
setAirplaneMode(mContext, true);
mCM.setAirplaneMode(true);
connectToWifi(mPowerSsid);
}
});

16
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java
View File

@@ -62,7 +62,7 @@ public class ConnectivityManagerMobileTest extends
if (Settings.Global.getInt(getInstrumentation().getContext().getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON) == 1) {
log("airplane is not disabled, disable it.");
cmActivity.setAirplaneMode(getInstrumentation().getContext(), false);
cmActivity.mCM.setAirplaneMode(false);
}
if (!mWifiOnlyFlag) {
@@ -87,7 +87,7 @@ public class ConnectivityManagerMobileTest extends
if (Settings.Global.getInt(getInstrumentation().getContext().getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON) == 1) {
log("disable airplane mode if it is enabled");
cmActivity.setAirplaneMode(getInstrumentation().getContext(), false);
cmActivity.mCM.setAirplaneMode(false);
}
super.tearDown();
}
@@ -344,7 +344,7 @@ public class ConnectivityManagerMobileTest extends
// Enable airplane mode
log("Enable airplane mode");
cmActivity.setAirplaneMode(getInstrumentation().getContext(), true);
cmActivity.mCM.setAirplaneMode(true);
sleep(ConnectivityManagerTestActivity.SHORT_TIMEOUT);
networkInfo = cmActivity.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
@@ -370,7 +370,7 @@ public class ConnectivityManagerMobileTest extends
NetworkState.DO_NOTHING, State.DISCONNECTED);
// disable airplane mode
cmActivity.setAirplaneMode(getInstrumentation().getContext(), false);
cmActivity.mCM.setAirplaneMode(false);
assertTrue(cmActivity.waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.CONNECTED,
ConnectivityManagerTestActivity.LONG_TIMEOUT));
@@ -400,7 +400,7 @@ public class ConnectivityManagerMobileTest extends
assertNotNull("SSID is null", mTestAccessPoint);
// Eanble airplane mode
log("Enable airplane mode");
cmActivity.setAirplaneMode(getInstrumentation().getContext(), true);
cmActivity.mCM.setAirplaneMode(true);
NetworkInfo networkInfo;
if (!mWifiOnlyFlag) {
@@ -437,7 +437,7 @@ public class ConnectivityManagerMobileTest extends
assertTrue("state validation failed", false);
}
}
cmActivity.setAirplaneMode(getInstrumentation().getContext(), false);
cmActivity.mCM.setAirplaneMode(false);
}
// Test case 7: test connectivity while transit from Wifi->AM->Wifi
@@ -463,7 +463,7 @@ public class ConnectivityManagerMobileTest extends
}
// Enable airplane mode without clearing Wifi
cmActivity.setAirplaneMode(getInstrumentation().getContext(), true);
cmActivity.mCM.setAirplaneMode(true);
assertTrue(cmActivity.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.DISCONNECTED,
ConnectivityManagerTestActivity.LONG_TIMEOUT));
@@ -481,7 +481,7 @@ public class ConnectivityManagerMobileTest extends
networkInfo.getState(), NetworkState.TO_CONNECTION, State.CONNECTED);
// Disable airplane mode
cmActivity.setAirplaneMode(getInstrumentation().getContext(), false);
cmActivity.mCM.setAirplaneMode(false);
assertTrue(cmActivity.waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.CONNECTED,
ConnectivityManagerTestActivity.WIFI_CONNECTION_TIMEOUT));