OSDN Git Service

Revert "Fix MediaDrm security level APIs"
authorTobias Thierer <tobiast@google.com>
Sun, 11 Feb 2018 15:01:04 +0000 (15:01 +0000)
committerTobias Thierer <tobiast@google.com>
Sun, 11 Feb 2018 15:02:09 +0000 (15:02 +0000)
commitfda717d50127c35f52880e94690042c7603600e3
tree47d37c9b05161218a405c9994aa661bb4acfb17f
parent778639efbe1db003487f788a4e7f513414bcfd7c
Revert "Fix MediaDrm security level APIs"

This reverts commit 778639efbe1db003487f788a4e7f513414bcfd7c.

Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.

https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log

Change-Id: I86bb202125b17bdeea12c414f3eca2a9e016dac2
api/current.txt
media/java/android/media/MediaDrm.java
media/jni/android_media_MediaDrm.cpp