diff options
8 files changed, 19 insertions, 25 deletions
diff --git a/framework/src/android/telephony/imsmedia/AudioSessionCallback.java b/framework/src/android/telephony/imsmedia/AudioSessionCallback.java index 25562fa2..78519471 100644 --- a/framework/src/android/telephony/imsmedia/AudioSessionCallback.java +++ b/framework/src/android/telephony/imsmedia/AudioSessionCallback.java @@ -156,12 +156,12 @@ public class AudioSessionCallback extends ImsMediaManager.SessionCallback { } @Override - public void notifyMediaInactivity(final int packetType, final int duration) { + public void notifyMediaInactivity(final int packetType) { if (mLocalCallback == null) return; final long callingIdentity = Binder.clearCallingIdentity(); try { - mExecutor.execute(() -> mLocalCallback.notifyMediaInactivity(packetType, duration)); + mExecutor.execute(() -> mLocalCallback.notifyMediaInactivity(packetType)); } finally { restoreCallingIdentity(callingIdentity); } @@ -272,9 +272,8 @@ public class AudioSessionCallback extends ImsMediaManager.SessionCallback { * setMediaQualityThreshold() API * * @param packetType either RTP or RTCP - * @param duration Inactivity duration */ - public void notifyMediaInactivity(final int packetType, final int duration) { + public void notifyMediaInactivity(final int packetType) { // Base Implementation } diff --git a/framework/src/android/telephony/imsmedia/IImsAudioSessionCallback.aidl b/framework/src/android/telephony/imsmedia/IImsAudioSessionCallback.aidl index 044a5533..549e548e 100644 --- a/framework/src/android/telephony/imsmedia/IImsAudioSessionCallback.aidl +++ b/framework/src/android/telephony/imsmedia/IImsAudioSessionCallback.aidl @@ -35,7 +35,7 @@ oneway interface IImsAudioSessionCallback { void onConfirmConfigResponse(in AudioConfig config, int result); void onFirstMediaPacketReceived(in AudioConfig config); void onHeaderExtensionReceived(in List<RtpHeaderExtension> extensions); - void notifyMediaInactivity(int packetType, int duration); + void notifyMediaInactivity(int packetType); void notifyPacketLoss(int packetLossPercentage); void notifyJitter(int jitter); void onMediaQualityChanged(in CallQuality callQuality); diff --git a/service/src/com/android/telephony/imsmedia/AudioOffloadListener.java b/service/src/com/android/telephony/imsmedia/AudioOffloadListener.java index f2f6633e..0c37e325 100644 --- a/service/src/com/android/telephony/imsmedia/AudioOffloadListener.java +++ b/service/src/com/android/telephony/imsmedia/AudioOffloadListener.java @@ -70,8 +70,8 @@ final class AudioOffloadListener extends IImsMediaSessionListener.Stub { } @Override - public void notifyMediaInactivity(int packetType, int timeout) { - Utils.sendMessage(handler, AudioSession.EVENT_MEDIA_INACTIVITY_IND, packetType, timeout); + public void notifyMediaInactivity(int packetType) { + Utils.sendMessage(handler, AudioSession.EVENT_MEDIA_INACTIVITY_IND, packetType); } @Override diff --git a/service/src/com/android/telephony/imsmedia/AudioSession.java b/service/src/com/android/telephony/imsmedia/AudioSession.java index 473e7868..b7a25d55 100644 --- a/service/src/com/android/telephony/imsmedia/AudioSession.java +++ b/service/src/com/android/telephony/imsmedia/AudioSession.java @@ -287,7 +287,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS handleRtpHeaderExtensionInd((List<RtpHeaderExtension>)msg.obj); break; case EVENT_MEDIA_INACTIVITY_IND: - notifyMediaInactivityInd(msg.arg1, msg.arg2); + notifyMediaInactivityInd(msg.arg1); break; case EVENT_PACKET_LOSS_IND: notifyPacketLossInd((int)msg.obj); @@ -495,9 +495,9 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS } } - private void notifyMediaInactivityInd(int packetType, int timeout) { + private void notifyMediaInactivityInd(int packetType) { try { - mCallback.notifyMediaInactivity(packetType, timeout); + mCallback.notifyMediaInactivity(packetType); } catch(RemoteException e) { Rlog.e(TAG, "Failed to notify media timeout: " + e); } diff --git a/test/app/ImsMediaTestingApp/app/src/main/java/com/example/imsmediatestingapp/MainActivity.java b/test/app/ImsMediaTestingApp/app/src/main/java/com/example/imsmediatestingapp/MainActivity.java index a96dd9e1..08489117 100644 --- a/test/app/ImsMediaTestingApp/app/src/main/java/com/example/imsmediatestingapp/MainActivity.java +++ b/test/app/ImsMediaTestingApp/app/src/main/java/com/example/imsmediatestingapp/MainActivity.java @@ -1014,8 +1014,8 @@ public class MainActivity extends AppCompatActivity { } @Override - public void notifyMediaInactivity(int packetType, int duration) { - super.notifyMediaInactivity(packetType, duration); + public void notifyMediaInactivity(int packetType) { + super.notifyMediaInactivity(packetType); } @Override diff --git a/test/imsmediahal/src/com/android/telephony/testimsmediahal/AudioListenerProxy.java b/test/imsmediahal/src/com/android/telephony/testimsmediahal/AudioListenerProxy.java index 71d787ff..b2c8425d 100644 --- a/test/imsmediahal/src/com/android/telephony/testimsmediahal/AudioListenerProxy.java +++ b/test/imsmediahal/src/com/android/telephony/testimsmediahal/AudioListenerProxy.java @@ -163,10 +163,9 @@ class AudioListenerProxy implements JNIImsMediaListener { break; case AudioSession.EVENT_MEDIA_INACTIVITY_IND: final int pktType = parcel.readInt(); - final int timeout = parcel.readInt(); try { - mMediaSessionListener.notifyMediaInactivity(pktType,timeout); + mMediaSessionListener.notifyMediaInactivity(pktType); } catch(RemoteException e) { Rlog.e(TAG, "Failed to notify media inactivity: " + e); } @@ -194,4 +193,4 @@ class AudioListenerProxy implements JNIImsMediaListener { break; } } - }
\ No newline at end of file + } diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java index bc076efd..edad32ea 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java @@ -76,7 +76,6 @@ public class AudioOffloadTest { private static final int SUCCESS = ImsMediaSession.RESULT_SUCCESS; private static final int RTP = ImsMediaSession.PACKET_TYPE_RTP; private static final int RTCP = ImsMediaSession.PACKET_TYPE_RTCP; - private static final int INACTIVITY_TIMEOUT = 20; private static final int PACKET_LOSS = 15; private static final int JITTER = 200; private static final char DTMF_DIGIT = '7'; @@ -359,19 +358,19 @@ public class AudioOffloadTest { @Test public void testMediaInactivityInd() { // Receive Inactivity - RTP - offloadListener.notifyMediaInactivity(MediaProtocolType.RTP, INACTIVITY_TIMEOUT); + offloadListener.notifyMediaInactivity(MediaProtocolType.RTP); processAllMessages(); try { - verify(callback, times(1)).notifyMediaInactivity(eq(RTP), eq(INACTIVITY_TIMEOUT)); + verify(callback, times(1)).notifyMediaInactivity(eq(RTP)); } catch(RemoteException e) { fail("Failed to notify notifyMediaInactivity: " + e); } // Receive Inactivity - RTCP - offloadListener.notifyMediaInactivity(MediaProtocolType.RTCP, INACTIVITY_TIMEOUT); + offloadListener.notifyMediaInactivity(MediaProtocolType.RTCP); processAllMessages(); try { - verify(callback, times(1)).notifyMediaInactivity(eq(RTCP), eq(INACTIVITY_TIMEOUT)); + verify(callback, times(1)).notifyMediaInactivity(eq(RTCP)); } catch(RemoteException e) { fail("Failed to notify notifyMediaInactivity: " + e); } diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java index 65fcabdd..2ce48cdb 100644 --- a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java +++ b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java @@ -61,7 +61,6 @@ public class AudioSessionTest { private static final int NO_RESOURCES = ImsMediaSession.RESULT_NO_RESOURCES; private static final int RTP = ImsMediaSession.PACKET_TYPE_RTP; private static final int RTCP = ImsMediaSession.PACKET_TYPE_RTCP; - private static final int INACTIVITY_TIMEOUT = 20; private static final int PACKET_LOSS = 15; private static final int JITTER = 200; private static final char DTMF_DIGIT = '7'; @@ -274,12 +273,11 @@ public class AudioSessionTest { Parcel parcel = Parcel.obtain(); parcel.writeInt(AudioSession.EVENT_MEDIA_INACTIVITY_IND); parcel.writeInt(RTP); - parcel.writeInt(INACTIVITY_TIMEOUT); parcel.setDataPosition(0); audioListener.onMessage(parcel); processAllMessages(); try { - verify(callback, times(1)).notifyMediaInactivity(eq(RTP), eq(INACTIVITY_TIMEOUT)); + verify(callback, times(1)).notifyMediaInactivity(eq(RTP)); } catch(RemoteException e) { fail("Failed to notify notifyMediaInactivity: " + e); } @@ -288,12 +286,11 @@ public class AudioSessionTest { Parcel parcel2 = Parcel.obtain(); parcel2.writeInt(AudioSession.EVENT_MEDIA_INACTIVITY_IND); parcel2.writeInt(RTCP); - parcel2.writeInt(INACTIVITY_TIMEOUT); parcel2.setDataPosition(0); audioListener.onMessage(parcel2); processAllMessages(); try { - verify(callback, times(1)).notifyMediaInactivity(eq(RTCP), eq(INACTIVITY_TIMEOUT)); + verify(callback, times(1)).notifyMediaInactivity(eq(RTCP)); } catch(RemoteException e) { fail("Failed to notify notifyMediaInactivity: " + e); } |