summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-03-09 17:12:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-09 17:12:11 +0000
commit3f451360585af081c5123a7aec3b8cebbf934f84 (patch)
tree832148d0826aa7032f40fde1066c071400ea3f79 /media
parentb9a23184272a75f1585e8dd64eeccc3a3e621d5f (diff)
parent1db71be52d989364e62971e997bea78703bf9f97 (diff)
downloadframeworks_av-3f451360585af081c5123a7aec3b8cebbf934f84.zip
frameworks_av-3f451360585af081c5123a7aec3b8cebbf934f84.tar.gz
frameworks_av-3f451360585af081c5123a7aec3b8cebbf934f84.tar.bz2
Merge "drm: fix clang warning"
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/tests/DrmSessionManager_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp b/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp
index a199ee1..fa002b8 100644
--- a/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp
+++ b/media/libmediaplayerservice/tests/DrmSessionManager_test.cpp
@@ -220,7 +220,7 @@ TEST_F(DrmSessionManagerTest, reclaimSession) {
// add a session from a higher priority process.
sp<FakeDrm> drm = new FakeDrm;
- const uint8_t ids[] = {456, 7890, 123};
+ const uint8_t ids[] = {1, 3, 5};
Vector<uint8_t> sessionId;
GetSessionId(ids, ARRAY_SIZE(ids), &sessionId);
mDrmSessionManager->addSession(30, drm, sessionId);