diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-22 07:10:28 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-22 07:10:28 +0000 |
commit | 6e6abc28565e2828b8153ac1fc6b18c91197616d (patch) | |
tree | a624067517d3b78520d52d3f306ede3fe13d71e3 | |
parent | 4c4d91d74d16a0af2bb3f04b13e2107035af81c6 (diff) | |
parent | 077dd3fef020b839e37b0c02fb5df7fadc7bf875 (diff) | |
download | ims-oreo-cts-release.tar.gz |
release-request-767e2998-9243-43e0-b656-1acb30ac5115-for-git_oc-release-4124637 snap-temp-L74200000076595014android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Change-Id: I60116c2c4e42bf72105caa32af9424015a4c5ad9
-rw-r--r-- | src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java | 15 | ||||
-rw-r--r-- | src/java/com/android/ims/internal/VideoPauseTracker.java | 9 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java index 1aae5338..d6da824f 100644 --- a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java +++ b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java @@ -535,4 +535,19 @@ public class ImsVideoCallProviderWrapper extends Connection.VideoProvider { public void setUseVideoPauseWorkaround(boolean useVideoPauseWorkaround) { mUseVideoPauseWorkaround = useVideoPauseWorkaround; } + + /** + * Called by {@code ImsPhoneConnection} when there is a change to the video state of the call. + * Informs the video pause tracker that the video is no longer paused. This ensures that + * subsequent pause requests are not filtered out. + * + * @param newVideoState The new video state. + */ + public void onVideoStateChanged(int newVideoState) { + if (mVideoPauseTracker.isPaused() && !VideoProfile.isPaused(newVideoState)) { + Log.i(this, "onVideoStateChanged: newVideoState=%s, clearing pending pause requests.", + VideoProfile.videoStateToString(newVideoState)); + mVideoPauseTracker.clearPauseRequests(); + } + } } diff --git a/src/java/com/android/ims/internal/VideoPauseTracker.java b/src/java/com/android/ims/internal/VideoPauseTracker.java index d37f7fa8..a23c5901 100644 --- a/src/java/com/android/ims/internal/VideoPauseTracker.java +++ b/src/java/com/android/ims/internal/VideoPauseTracker.java @@ -150,6 +150,15 @@ public class VideoPauseTracker { } /** + * Clears pending pause requests for the tracker. + */ + public void clearPauseRequests() { + synchronized (mPauseRequestsLock) { + mPauseRequests.clear(); + } + } + + /** * Returns a string equivalent of a {@code SOURCE_*} constant. * * @param source A {@code SOURCE_*} constant. |