am da019f95: am 5d5d1baf: Merge "Address unit test failures" into klp-dev

* commit 'da019f95568a7833e2490094017f4afcaae44bfd':
  Address unit test failures
This commit is contained in:
Jeff Tinker
2013-12-12 19:37:47 +00:00
committed by Android Git Automerger
7 changed files with 32 additions and 25 deletions

View File

@@ -86,7 +86,7 @@ class SurfacePanel extends SurfaceView implements SurfaceHolder.Callback
public class MediaDrmAPITest extends Activity {
private final String TAG = "MediaDrmAPITest";
static final String kKeyServerUrl = "https://jmt17.google.com/video-dev/license/GetCencLicense";
static final String kKeyServerUrl = "https://jmt17.google.com/video/license/GetCencLicense";
static final String kOperatorSessionKeyServerUrl = "http://kir03wwwg185.widevine.net/drm";
static final UUID kWidevineScheme = new UUID(0xEDEF8BA979D64ACEL, 0xA3C827DCD51D21EDL);