Merge "Check integer key existence of MediaFormat" into androidx-master-dev

3 files changed, 7 insertions, 5 deletions

diff --git a/media2/common/src/main/java/androidx/media2/common/SessionPlayer.java b/media2/common/src/main/java/androidx/media2/common/SessionPlayer.java
index 1ff0189a15e..f16d5b378da 100644
--- a/media2/common/src/main/java/androidx/media2/common/SessionPlayer.java
+++ b/media2/common/src/main/java/androidx/media2/common/SessionPlayer.java
@@ -1169,7 +1169,13 @@ public abstract class SessionPlayer implements AutoCloseable {
         }
 
         private boolean intEquals(String key, MediaFormat format1, MediaFormat format2) {
-            return format1.getInteger(key) == format2.getInteger(key);
+            boolean exists1 = format1.containsKey(key);
+            boolean exists2 = format2.containsKey(key);
+            if (exists1 && exists2) {
+                return format1.getInteger(key) == format2.getInteger(key);
+            } else {
+                return !exists1 && !exists2;
+            }
         }
 
         private void parcelIntValue(String key) {
diff --git a/media2/session/src/androidTest/java/androidx/media2/session/MediaControllerTest.java b/media2/session/src/androidTest/java/androidx/media2/session/MediaControllerTest.java
index 77aeccd9daa..649af1b65c2 100644
--- a/media2/session/src/androidTest/java/androidx/media2/session/MediaControllerTest.java
+++ b/media2/session/src/androidTest/java/androidx/media2/session/MediaControllerTest.java
@@ -65,7 +65,6 @@ import androidx.testutils.PollingCheck;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -1721,7 +1720,6 @@ public class MediaControllerTest extends MediaSessionTestBase {
         assertNull(controller.getSelectedTrack(testTrackType));
     }
 
-    @Ignore("b/134375069")
     @Test
     public void testOnSubtitleData() throws InterruptedException {
         prepareLooper();
diff --git a/media2/session/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java b/media2/session/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
index b8403f3fc58..e37fc041acd 100644
--- a/media2/session/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
+++ b/media2/session/version-compat-tests/current/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
@@ -63,7 +63,6 @@ import androidx.test.filters.SdkSuppress;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -943,7 +942,6 @@ public class MediaControllerCallbackTest extends MediaSessionTestBase {
         assertTrue(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
     }
 
-    @Ignore("b/134375069")
     @Test
     public void testOnSubtitleData() throws InterruptedException {
         prepareLooper();