From 3553dfe9da9f1bff6d62f3ea52f71f956a5f429b Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Sun, 11 Feb 2018 15:01:09 +0000 Subject: Revert "Fix MediaDrm security level APIs" This reverts commit 52d274d3428a26c3130fd72dfcc2be2f3058d56e. Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector &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: I6c1029e615ea9f418d265c75db28981036c98ee8 --- headers/media_plugin/media/drm/DrmAPI.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/headers/media_plugin/media/drm/DrmAPI.h b/headers/media_plugin/media/drm/DrmAPI.h index c44a1f6152..0a3a3564de 100644 --- a/headers/media_plugin/media/drm/DrmAPI.h +++ b/headers/media_plugin/media/drm/DrmAPI.h @@ -148,9 +148,6 @@ namespace android { enum SecurityLevel { // Failure to access security level, an error occurred kSecurityLevelUnknown, - // The maximum security level of the device. This is the default when - // a session is opened if no security level is specified - kSecurityLevelMax, // Software-based whitebox crypto kSecurityLevelSwSecureCrypto, // Software-based whitebox crypto and an obfuscated decoder -- cgit v1.2.3-59-g8ed1b