Minor visibility changes to make tests work again.
Change-Id: I023974f9f145ec9b39b6d8a1c3b1679638dd59f7
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 8a85f2c..4e081ee 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -38,6 +38,7 @@
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telecom.IVideoProvider;
import com.android.internal.telephony.CallerInfo;
import com.android.internal.telephony.CallerInfoAsyncQuery;
@@ -60,7 +61,8 @@
* from the time the call intent was received by Telecom (vs. the time the call was
* connected etc).
*/
-final class Call implements CreateConnectionResponse {
+@VisibleForTesting
+final public class Call implements CreateConnectionResponse {
/**
* Listener for events on the call.
*/
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 3732a4f..f412ab1 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -37,6 +37,7 @@
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import java.util.Collection;
@@ -975,7 +976,8 @@
return true;
}
- Call getRingingCall() {
+ @VisibleForTesting
+ public Call getRingingCall() {
return getFirstCallWithState(CallState.RINGING);
}
diff --git a/src/com/android/server/telecom/InCallWakeLockController.java b/src/com/android/server/telecom/InCallWakeLockController.java
index d97e171..b6d3820 100644
--- a/src/com/android/server/telecom/InCallWakeLockController.java
+++ b/src/com/android/server/telecom/InCallWakeLockController.java
@@ -16,14 +16,16 @@
package com.android.server.telecom;
+import com.android.internal.annotations.VisibleForTesting;
+
import android.content.Context;
import android.os.PowerManager;
-import android.telecom.CallState;
/**
* Handles acquisition and release of wake locks relating to call state.
*/
-class InCallWakeLockController extends CallsManagerListenerBase {
+@VisibleForTesting
+public class InCallWakeLockController extends CallsManagerListenerBase {
private static final String TAG = "InCallWakeLockContoller";
@@ -31,7 +33,8 @@
private final PowerManager.WakeLock mFullWakeLock;
private final CallsManager mCallsManager;
- InCallWakeLockController(Context context, CallsManager callsManager) {
+ @VisibleForTesting
+ public InCallWakeLockController(Context context, CallsManager callsManager) {
mContext = context;
mCallsManager = callsManager;
diff --git a/tests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java b/tests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
index 5af9440..f617723 100644
--- a/tests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
+++ b/tests/src/com/android/server/telecom/tests/unit/InCallWakeLockControllerTest.java
@@ -14,10 +14,8 @@
* limitations under the License.
*/
-package com.android.server.telecom;
+package com.android.server.telecom.tests.unit;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.never;