[Clank] Load/Remove persistent license

media/base/android/media_drm_bridge.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_drm_bridge.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 261 matching lines @@
 
 // static
 bool MediaDrmBridge::IsKeySystemSupported(const std::string& key_system) {
   if (!MediaDrmBridge::IsAvailable())
     return false;
 
   return IsKeySystemSupportedWithTypeImpl(key_system, "");
 }
 
 // static
 bool MediaDrmBridge::IsPersistentLicenseTypeSupported(

[xhwang, 2017/04/05 18:31:50]

Please also check the following in this function:

base::android::BuildInfo::GetInstance()->sdk_int() >= 23

similar to the logic around use_origin_isolated_storage.

[yucliu1, 2017/04/05 23:04:07]

Done.

     const std::string& key_system) {
   if (!MediaDrmBridge::IsAvailable())
     return false;
 
   if (!base::FeatureList::IsEnabled(kMediaDrmPersistentLicense)) {
     return false;
   }
 
   NOTIMPLEMENTED() << "In development. See http://crbug.com/493521";
   return false;
@@ skipping 160 matching lines @@
       promise_id);
 }
 
 void MediaDrmBridge::LoadSession(
     CdmSessionType session_type,
     const std::string& session_id,
     std::unique_ptr<media::NewSessionCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DVLOG(2) << __func__;
 
   DCHECK(base::FeatureList::IsEnabled(kMediaDrmPersistentLicense));

[xhwang, 2017/04/05 18:31:50]

You can probably just DCHECK(IsPersistentLicenseTypeSupported()) here.

[yucliu1, 2017/04/05 23:04:07]

Done.

 
-  NOTIMPLEMENTED() << "EME persistent sessions not yet supported on Android.";
-  promise->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
-                  "LoadSession() is not supported.");
+  if (session_type != CdmSessionType::PERSISTENT_LICENSE_SESSION) {
+    promise->reject(
+        CdmPromise::NOT_SUPPORTED_ERROR, 0,
+        "LoadSession() is only supported for 'persistent-license'.");
+    return;
+  }
+
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
+      env, reinterpret_cast<const uint8_t*>(session_id.data()),
+      session_id.size());

[xhwang, 2017/04/05 18:31:50]

Might worth putting this in a helper function.

[yucliu1, 2017/04/05 23:04:07]

Done.

+  uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
+  Java_MediaDrmBridge_loadSession(env, j_media_drm_, j_session_id, promise_id);
 }
 
 void MediaDrmBridge::UpdateSession(
     const std::string& session_id,
     const std::vector<uint8_t>& response,
     std::unique_ptr<media::SimpleCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DVLOG(2) << __func__;
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 20 matching lines @@
   uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
   Java_MediaDrmBridge_closeSession(env, j_media_drm_, j_session_id, promise_id);
 }
 
 void MediaDrmBridge::RemoveSession(
     const std::string& session_id,
     std::unique_ptr<media::SimpleCdmPromise> promise) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DVLOG(2) << __func__;
 
-  NOTIMPLEMENTED() << "EME persistent sessions not yet supported on Android.";
-  promise->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,
-                  "RemoveSession() is not supported.");
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jbyteArray> j_session_id = base::android::ToJavaByteArray(
+      env, reinterpret_cast<const uint8_t*>(session_id.data()),
+      session_id.size());
+  uint32_t promise_id = cdm_promise_adapter_.SavePromise(std::move(promise));
+  Java_MediaDrmBridge_removeSession(env, j_media_drm_, j_session_id,
+                                    promise_id);
 }
 
 CdmContext* MediaDrmBridge::GetCdmContext() {
   DVLOG(2) << __func__;
 
   return &media_drm_bridge_cdm_context_;
 }
 
 void MediaDrmBridge::DeleteOnCorrectThread() const {
   DVLOG(1) << __func__;
@@ skipping 403 matching lines @@
 }
 
 void MediaDrmBridge::OnHasAdditionalUsableKey() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DVLOG(1) << __func__;
 
   player_tracker_.NotifyNewKey();
 }
 
 }  // namespace media