| commit | 11ecf10094d14a25de851a3a26178ed48a71bea0 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue May 16 18:28:46 2017 -0700 |
| committer | Chong Zhang <chz@google.com> | Tue May 16 18:28:46 2017 -0700 |
| tree | 933c7d2e75c1d8a1c0992c7c6b19bbccc7068583 | |
| parent | a0591c47fedd4679b092c113b3a8d0d67f9c732a [diff] |
cas: allow empty data array to be used in place of null bug: 22804304 Change-Id: Ia8b1fbe23b41a9af43e27f583c968784aa2b2b07
diff --git a/tests/tests/media/src/android/media/cts/MediaCasTest.java b/tests/tests/media/src/android/media/cts/MediaCasTest.java index a3cdefc..65ca184 100644 --- a/tests/tests/media/src/android/media/cts/MediaCasTest.java +++ b/tests/tests/media/src/android/media/cts/MediaCasTest.java
@@ -511,7 +511,9 @@ Log.d(TAG, "Received MediaCas event: event=" + event + ", arg=" + arg + ", data=" + data); if (mediaCas == mMediaCas && event == mEvent - && arg == mArg && Arrays.equals(data, mData)) { + && arg == mArg && (Arrays.equals(data, mData) || + data == null && mData.length == 0 || + mData == null && data.length == 0)) { mIsIdential = true; } mLatch.countDown();