Revert "Fix MediaDrm security level APIs"
This reverts commit 6a5934aee3b1313daf82d6063827e9a4f4c96ab6.
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: I8a1ce95ca6f48bec6c46f84a0fef7a48f975c406
diff --git a/drm/1.1/IDrmPlugin.hal b/drm/1.1/IDrmPlugin.hal
index 2980dc2..7dd397a 100644
--- a/drm/1.1/IDrmPlugin.hal
+++ b/drm/1.1/IDrmPlugin.hal
@@ -26,7 +26,6 @@
import @1.0::SecureStopId;
import @1.1::SecureStopRelease;
import @1.1::SecurityLevel;
-import @1.0::SessionId;
/**
* IDrmPlugin is used to interact with a specific drm plugin that was created by
@@ -35,34 +34,6 @@
*/
interface IDrmPlugin extends @1.0::IDrmPlugin {
/**
- * Open a new session at a requested security level. The security level
- * represents the robustness of the device's DRM implementation. By default,
- * sessions are opened at the native security level of the device which is
- * the maximum level that can be supported. Overriding the security level is
- * necessary when the decrypted frames need to be manipulated, such as for
- * image compositing. The security level parameter must be equal to or lower
- * than the native level. If the requested level is not supported, the next
- * lower supported security level must be set. The level can be queried
- * using {@link #getSecurityLevel}. A session ID is returned. When the
- * drm@1.0 openSession is called, which has no securityLevel parameter, the
- * security level is defaulted to the native security level of the device.
- *
- * @return status the status of the call. The status must be OK or one of
- * the following errors: ERROR_DRM_NOT_PROVISIONED if the device
- * requires provisioning before it can open a session,
- * ERROR_DRM_RESOURCE_BUSY if there are insufficent resources available
- * to open a session, ERROR_DRM_CANNOT_HANDLE if the requested security
- * level is higher than the native level or lower than the lowest
- * supported level or if openSession is not supported at the time of
- * the call, or ERROR_DRM_INVALID_STATE if the HAL is in a state where
- * a session cannot be opened.
- * @param level the requested security level
- * @return sessionId the session ID for the newly opened session
- */
- openSession_1_1(SecurityLevel securityLevel) generates (Status status,
- SessionId sessionId);
-
- /**
* A key request/response exchange occurs between the app and a License
* Server to obtain the keys required to decrypt the content.
* getKeyRequest_1_1() is used to obtain an opaque key request blob that is
@@ -178,6 +149,24 @@
SecurityLevel level);
/**
+ * Set the security level of a session. This can be useful if specific
+ * attributes of a lower security level are needed by an application, such
+ * as image manipulation or compositing which requires non-secure decoded
+ * frames. Reducing the security level may limit decryption to lower content
+ * resolutions, depending on the license policy.
+ *
+ * @param sessionId the session id the call applies to
+ * @param level the requested security level
+ * @return status the status of the call. The status must be OK or one of
+ * the following errors: ERROR_DRM_SESSION_NOT_OPENED if the session
+ * is not opened, BAD_VALUE if the sessionId or security level is
+ * invalid or ERROR_DRM_INVALID_STATE if the HAL is in a state where
+ * the security level cannot be set.
+ */
+ setSecurityLevel(vec<uint8_t> sessionId, SecurityLevel level)
+ generates(Status status);
+
+ /**
* Returns the plugin-specific metrics. Multiple metric groups may be
* returned in one call to getMetrics(). The scope and definition of the
* metrics is defined by the plugin.