Merge "Fixed file descriptor leak in telephony unit tests"
diff --git a/src/java/com/android/internal/telephony/test/SimulatedCommands.java b/src/java/com/android/internal/telephony/test/SimulatedCommands.java
index 0fb50a6..59d999f 100644
--- a/src/java/com/android/internal/telephony/test/SimulatedCommands.java
+++ b/src/java/com/android/internal/telephony/test/SimulatedCommands.java
@@ -151,6 +151,12 @@
mPin2Code = DEFAULT_SIM_PIN2_CODE;
}
+ public void dispose() {
+ if (mHandlerThread != null) {
+ mHandlerThread.quit();
+ }
+ }
+
private void log(String str) {
Rlog.d(LOG_TAG, str);
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/CallManagerTest.java b/tests/telephonytests/src/com/android/internal/telephony/CallManagerTest.java
index a255f26..8231d06 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/CallManagerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/CallManagerTest.java
@@ -122,7 +122,7 @@
@After
public void tearDown() throws Exception {
CallManager.getInstance().unregisterPhone(mPhone);
- mCallManagerHandlerThread.quitSafely();
+ mCallManagerHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/DeviceStateMonitorTest.java b/tests/telephonytests/src/com/android/internal/telephony/DeviceStateMonitorTest.java
index 0745092..5d89d08 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/DeviceStateMonitorTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/DeviceStateMonitorTest.java
@@ -71,7 +71,7 @@
@After
public void tearDown() throws Exception {
mDeviceStateMonitor = null;
- mDeviceStateMonitorTestHandler.quitSafely();
+ mDeviceStateMonitorTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java
index 1515860..bc43aae 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java
@@ -85,7 +85,7 @@
@After
public void tearDown() throws Exception {
mCTUT = null;
- mGsmCdmaCTHandlerThread.quitSafely();
+ mGsmCdmaCTHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
index 39fdf13..6301d54 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java
@@ -132,7 +132,7 @@
public void tearDown() throws Exception {
mPhoneUT.removeCallbacksAndMessages(null);
mPhoneUT = null;
- mGsmCdmaPhoneTestHandler.quitSafely();
+ mGsmCdmaPhoneTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java b/tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java
index 24c1283..be829ef 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java
@@ -95,7 +95,7 @@
@After
public void tearDown() throws Exception {
mImsSmsDispatcher = null;
- mImsSmsDispatcherTestHandler.quitSafely();
+ mImsSmsDispatcherTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java b/tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java
index 4a17199..fdda80f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java
@@ -60,7 +60,7 @@
@After
public void tearDown() throws Exception {
- mPhoneStateListenerHandler.quitSafely();
+ mPhoneStateListenerHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java b/tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java
index e68262f..b5ec320 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java
@@ -388,6 +388,12 @@
// }
// if (commandsInterfaces[0].isDataAllowed()) fail("data allowed");
// if (commandsInterfaces[1].isDataAllowed()) fail("data allowed");
+
+ for (int i = 0; i < numPhones; i++) {
+ commandsInterfaces[i].dispose();
+ }
+
+ connectivityServiceMock.die();
testHandler.die();
handlerThread.quit();
}
@@ -468,6 +474,11 @@
if (commandsInterfaces[0].isDataAllowed()) fail("data allowed");
if (commandsInterfaces[1].isDataAllowed() == false) fail("data not allowed");
+ for (int i = 0; i < numPhones; i++) {
+ commandsInterfaces[i].dispose();
+ }
+
+ connectivityServiceMock.die();
testHandler.die();
handlerThread.quit();
}
@@ -537,6 +548,11 @@
if (commandsInterfaces[0].isDataAllowed() == false) fail("data not allowed");
if (commandsInterfaces[1].isDataAllowed()) fail("data allowed");
+ for (int i = 0; i < numPhones; i++) {
+ commandsInterfaces[i].dispose();
+ }
+
+ connectivityServiceMock.die();
testHandler.die();
handlerThread.quit();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
index 1762b84..c8d459a 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
@@ -150,7 +150,7 @@
@After
public void tearDown() throws Exception {
sst = null;
- mSSTTestHandler.quitSafely();
+ mSSTTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/SmsStorageMonitorTest.java b/tests/telephonytests/src/com/android/internal/telephony/SmsStorageMonitorTest.java
index 7c8c15c..cbc56ae 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SmsStorageMonitorTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SmsStorageMonitorTest.java
@@ -67,7 +67,7 @@
@After
public void tearDown() throws Exception {
mSmsStorageMonitor = null;
- mSmsStorageMonitorTestHandler.quitSafely();
+ mSmsStorageMonitorTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
index 4960e72..ea2f17d 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java
@@ -128,7 +128,7 @@
@After
public void tearDown() throws Exception {
- mSubscriptionInfoUpdaterHandlerThread.quitSafely();
+ mSubscriptionInfoUpdaterHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
index 15c9314..e944806 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
@@ -444,6 +444,8 @@
protected void tearDown() throws Exception {
+ mSimulatedCommands.dispose();
+
SharedPreferences sharedPreferences = mContext.getSharedPreferences((String) null, 0);
sharedPreferences.edit().clear().commit();
diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
index 82169d4..a26741f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
@@ -159,7 +159,7 @@
assertFalse(mCdmaInboundSmsHandler.getWakeLock().isHeld());
mCdmaInboundSmsHandler = null;
mContentProvider.shutdown();
- mCdmaInboundSmsHandlerTestHandler.quitSafely();
+ mCdmaInboundSmsHandlerTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
index e3ba4ff..a308762 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
@@ -72,7 +72,7 @@
@After
public void tearDown() throws Exception {
mCdmaSmsDispatcher = null;
- mCdmaSmsDispatcherTestHandler.quitSafely();
+ mCdmaSmsDispatcherTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
index b56ef1c..1e34910 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
@@ -164,7 +164,7 @@
logd("tearDown");
mDc = null;
mDcc = null;
- mDataConnectionTestHandler.quitSafely();
+ mDataConnectionTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
index f2661f6..d209639 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
@@ -114,7 +114,7 @@
@After
public void tearDown() throws Exception {
- mDcControllerTestHandler.quitSafely();
+ mDcControllerTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
index 70e2b6c..3a8cf61 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
@@ -359,7 +359,7 @@
logd("DcTrackerTest -tearDown");
mDct.removeCallbacksAndMessages(null);
mDct = null;
- mDcTrackerTestHandler.quitSafely();
+ mDcTrackerTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
index e377600..a60b502 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
@@ -98,6 +98,7 @@
}
void die() {
+ connectivityServiceMock.die();
looper.quit();
handlerThread.quit();
}
@@ -139,7 +140,7 @@
TestSetup ts = new TestSetup(numberOfPhones);
- TelephonyNetworkFactory tnf = makeTnf(phoneId, ts);
+ makeTnf(phoneId, ts);
ts.subscriptionControllerMock.setDefaultDataSubId(subId);
ts.subscriptionControllerMock.setSlotSubId(phoneId, subId);
@@ -234,7 +235,7 @@
TestSetup ts = new TestSetup(numberOfPhones);
- TelephonyNetworkFactory tnf = makeTnf(phoneId, ts);
+ makeTnf(phoneId, ts);
ts.subscriptionControllerMock.setDefaultDataSubId(subId);
ts.subscriptionControllerMock.setSlotSubId(phoneId, subId);
@@ -272,7 +273,7 @@
fail("test 5, LiveRequests != 0");
}
- NetworkRequest subSpecificMms = makeSubSpecificMmsRequest(ts, subId);
+ makeSubSpecificMmsRequest(ts, subId);
waitABit();
if (ts.dcTrackerMock.getNumberOfLiveRequests() != 1) {
fail("test 6, LiveRequests != 1");
@@ -285,7 +286,7 @@
fail("test 7, LiveRequests != 0");
}
- NetworkRequest subSpecificDefault = makeSubSpecificDefaultRequest(ts, subId);
+ makeSubSpecificDefaultRequest(ts, subId);
waitABit();
if (ts.dcTrackerMock.getNumberOfLiveRequests() != 0) {
fail("test 8, LiveRequests != 0");
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
index 20cefb9..2575cac 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
@@ -95,7 +95,7 @@
@After
public void tearDown() throws Exception {
mGsmCellBroadcastHandler = null;
- mGsmCellBroadcastHandlerTestHandler.quitSafely();
+ mGsmCellBroadcastHandlerTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
index 340ff35..92f2bf6 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
@@ -187,7 +187,7 @@
assertFalse(mGsmInboundSmsHandler.getWakeLock().isHeld());
mGsmInboundSmsHandler = null;
mContentProvider.shutdown();
- mGsmInboundSmsHandlerTestHandler.quitSafely();
+ mGsmInboundSmsHandlerTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
index fc06962..6da7ca9 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
@@ -91,7 +91,7 @@
@After
public void tearDown() throws Exception {
mGsmSmsDispatcher = null;
- mGsmSmsDispatcherTestHandler.quitSafely();
+ mGsmSmsDispatcherTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java
index d2238d7..db1dcf1 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java
@@ -207,7 +207,7 @@
@After
public void tearDown() throws Exception {
mCTUT = null;
- mImsCTHandlerThread.quitSafely();
+ mImsCTHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneFactoryTest.java
index 8a7c53a..c31541e 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneFactoryTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneFactoryTest.java
@@ -60,7 +60,7 @@
@After
public void tearDown() throws Exception {
- mImsPhoneFactoryHandler.quitSafely();
+ mImsPhoneFactoryHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
index de0c8ce..fc3c296 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
@@ -141,7 +141,7 @@
@After
public void tearDown() throws Exception {
mImsPhoneUT = null;
- mImsPhoneTestHandler.quitSafely();
+ mImsPhoneTestHandler.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java b/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
index 362709b..43763ec 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java
@@ -127,6 +127,9 @@
public void die() {
// clean up threads/handlers
+ if (mHandlerThread != null) {
+ mHandlerThread.quit();
+ }
}
private class InternalHandler extends Handler {
diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/IccPhoneBookInterfaceManagerTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/IccPhoneBookInterfaceManagerTest.java
index c99bd75..9510619 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/uicc/IccPhoneBookInterfaceManagerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/IccPhoneBookInterfaceManagerTest.java
@@ -89,7 +89,7 @@
@After
public void tearDown() throws Exception {
- mIccPhoneBookInterfaceManagerHandler.quitSafely();
+ mIccPhoneBookInterfaceManagerHandler.quit();
super.tearDown();
}
@Test
diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardApplicationTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardApplicationTest.java
index 1a5daeb..60f5f6f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardApplicationTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardApplicationTest.java
@@ -110,7 +110,7 @@
@After
public void tearDown() throws Exception {
- mTestHandlerThread.quitSafely();
+ mTestHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardTest.java
index 9a24a86..e090c25 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccCardTest.java
@@ -134,7 +134,7 @@
@After
public void tearDown() throws Exception {
- mTestHandlerThread.quitSafely();
+ mTestHandlerThread.quit();
super.tearDown();
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
index 12c2690..e62700a 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/uicc/UiccControllerTest.java
@@ -96,7 +96,7 @@
@After
public void tearDown() throws Exception {
- mUiccControllerHandlerThread.quitSafely();
+ mUiccControllerHandlerThread.quit();
super.tearDown();
}
