Make Telecom CTS coverage more accurate
The CTS coverage tracker does not detect coverage for callbacks
unless we explictly call the super implementation.
Bug: 20303674
Change-Id: I9161af7f7b9c1ac211b0d9eec9fe936caa0164be
diff --git a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
index fbbf3ca..d51b14a 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
@@ -69,7 +69,8 @@
assertMuteState(connection, false);
- inCallService.setMuted(true);
+ // Explicitly call super implementation to enable detection of CTS coverage
+ ((InCallService) inCallService).setMuted(true);
assertMuteState(connection, true);
assertMuteState(inCallService, true);
@@ -95,7 +96,8 @@
// Only test speaker and earpiece modes because the other modes are dependent on having
// a bluetooth headset or wired headset connected.
- inCallService.setAudioRoute(CallAudioState.ROUTE_SPEAKER);
+ // Explicitly call super implementation to enable detection of CTS coverage
+ ((InCallService) inCallService).setAudioRoute(CallAudioState.ROUTE_SPEAKER);
assertAudioRoute(connection, CallAudioState.ROUTE_SPEAKER);
assertAudioRoute(inCallService, CallAudioState.ROUTE_SPEAKER);
diff --git a/tests/tests/telecom/src/android/telecom/cts/MockConnection.java b/tests/tests/telecom/src/android/telecom/cts/MockConnection.java
index bf9d730..460b060 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockConnection.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockConnection.java
@@ -38,57 +38,67 @@
@Override
public void onAnswer() {
- onAnswer(VideoProfile.STATE_AUDIO_ONLY);
+ super.onAnswer();
}
@Override
public void onAnswer(int videoState) {
+ super.onAnswer(videoState);
this.videoState = videoState;
setActive();
}
@Override
public void onReject() {
+ super.onReject();
setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
}
@Override
public void onHold() {
+ super.onHold();
setOnHold();
}
@Override
public void onUnhold() {
+ super.onUnhold();
setActive();
}
@Override
public void onDisconnect() {
+ super.onDisconnect();
setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
destroy();
}
@Override
public void onAbort() {
+ super.onAbort();
}
@Override
public void onPlayDtmfTone(char c) {
+ super.onPlayDtmfTone(c);
mDtmfString += c;
}
@Override
public void onStopDtmfTone() {
+ super.onStopDtmfTone();
mDtmfString += ".";
}
@Override
public void onCallAudioStateChanged(CallAudioState state) {
+ super.onCallAudioStateChanged(state);
mCallAudioState = state;
}
@Override
public void onStateChanged(int state) {
+ super.onStateChanged(state);
mState = state;
}
diff --git a/tests/tests/telecom/src/android/telecom/cts/MockVideoProvider.java b/tests/tests/telecom/src/android/telecom/cts/MockVideoProvider.java
index 8ed422f..a1b6b65 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockVideoProvider.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockVideoProvider.java
@@ -87,7 +87,7 @@
*/
@Override
public void onSendSessionModifyRequest(VideoProfile fromProfile, VideoProfile toProfile) {
- receiveSessionModifyResponse(Connection.VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS,
+ super.receiveSessionModifyResponse(Connection.VideoProvider.SESSION_MODIFY_REQUEST_SUCCESS,
toProfile, toProfile);
mMockConnection.setVideoState(toProfile.getVideoState());
}
@@ -111,7 +111,7 @@
*/
@Override
public void onRequestConnectionDataUsage() {
- setCallDataUsage(DATA_USAGE);
+ super.setCallDataUsage(DATA_USAGE);
}
@Override
@@ -126,11 +126,11 @@
private void handleCameraChange(String cameraId) {
mCameraId = cameraId;
if (CAMERA_FRONT.equals(mCameraId)) {
- changeCameraCapabilities(new VideoProfile.CameraCapabilities(CAMERA_FRONT_DIMENSIONS,
- CAMERA_FRONT_DIMENSIONS));
+ super.changeCameraCapabilities(new VideoProfile.CameraCapabilities(
+ CAMERA_FRONT_DIMENSIONS, CAMERA_FRONT_DIMENSIONS));
} else if (CAMERA_BACK.equals(mCameraId)) {
- changeCameraCapabilities(new VideoProfile.CameraCapabilities(CAMERA_BACK_DIMENSIONS,
- CAMERA_BACK_DIMENSIONS));
+ super.changeCameraCapabilities(new VideoProfile.CameraCapabilities(
+ CAMERA_BACK_DIMENSIONS, CAMERA_BACK_DIMENSIONS));
}
}
@@ -140,7 +140,7 @@
* @param videoQuality The video quality.
*/
public void sendMockVideoQuality(int videoQuality) {
- changeVideoQuality(videoQuality);
+ super.changeVideoQuality(videoQuality);
}
/**
@@ -149,7 +149,7 @@
* @param event The call session event.
*/
public void sendMockCallSessionEvent(int event) {
- handleCallSessionEvent(event);
+ super.handleCallSessionEvent(event);
}
/**
@@ -158,7 +158,7 @@
* @param width The peer width.
*/
public void sendMockPeerWidth(int width) {
- changePeerDimensions(width, width);
+ super.changePeerDimensions(width, width);
}
/**
@@ -167,7 +167,7 @@
* @param request The requested profile.
*/
public void sendMockSessionModifyRequest(VideoProfile request) {
- receiveSessionModifyRequest(request);
+ super.receiveSessionModifyRequest(request);
}
public int getDeviceOrientation() {
