commit fe80961419693feafb2d7f8f391bfbbd5eb81f30
author Tyler Gunn <tgunn@google.com> Wed Jun 21 21:43:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 21:43:27 2017 +0000
tree 6d448b97b4e0ef1981e69f17b30919ecc6eaf5df
parent 75d16e152066ddf7575ee75748e221e89e3d7819
parent 3a4673417db6c691ceddbd5ef296e7e9710e956f

Clear video pause tracker when video un-pause reported by the modem. am: 077dd3fef0
am: 3a4673417d

Change-Id: I282592ec251b489d73b6307a4bccf0e1a0930307

src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java

diff --git a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
index 1aae533..d6da824 100644
--- a/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
+++ b/src/java/com/android/ims/internal/ImsVideoCallProviderWrapper.java
@@ -535,4 +535,19 @@
     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();
+        }
+    }
 }

src/java/com/android/ims/internal/VideoPauseTracker.java

diff --git a/src/java/com/android/ims/internal/VideoPauseTracker.java b/src/java/com/android/ims/internal/VideoPauseTracker.java
index d37f7fa..a23c590 100644
--- a/src/java/com/android/ims/internal/VideoPauseTracker.java
+++ b/src/java/com/android/ims/internal/VideoPauseTracker.java
@@ -150,6 +150,15 @@
     }
 
     /**
+     * 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.