Replace toStatus indirection.

CdmResponseType are mapped to android::status_t, then map to hidl
android::hardware::drm::V1_0::Status. This CL removes the indirection
by mapping cdm errors to hidl Status.

Test: Play Movies (pin and streaming)
Test: Netflix (download and streaming)
Test: libwvdrmmediacrypto_hidl_test and libwvdrmdrmplugin_hidl_test
Test: GtsMediaTestCases module
Test: Vts - VtsHalDrmV1_0Target

bug: 34682447
Change-Id: I0b04f47871f5e4898e7297831d5fceab52e0f7f9

libwvdrmengine/src_hidl/TypeConvert.cpp

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "TypeConvert.h"
-
-#include <log/log.h>
-
-namespace android {
-namespace hardware {
-namespace drm {
-namespace V1_0 {
-namespace widevine {
-
-Status toStatus(status_t mediaError) {
-    Status status;
-    switch(mediaError) {
-    case android::OK:
-        status = Status::OK;
-        break;
-    case android::ERROR_DRM_NO_LICENSE:
-        status = Status::ERROR_DRM_NO_LICENSE;
-        break;
-    case android::ERROR_DRM_LICENSE_EXPIRED:
-        status = Status::ERROR_DRM_LICENSE_EXPIRED;
-        break;
-    case android::ERROR_DRM_SESSION_NOT_OPENED:
-        status = Status::ERROR_DRM_SESSION_NOT_OPENED;
-        break;
-    case android::ERROR_DRM_CANNOT_HANDLE:
-        status = Status::ERROR_DRM_CANNOT_HANDLE;
-        break;
-    case android::ERROR_DRM_TAMPER_DETECTED:
-        status = Status::ERROR_DRM_INVALID_STATE;
-        break;
-    case android::BAD_VALUE:
-        status = Status::BAD_VALUE;
-        break;
-    case android::ERROR_DRM_NOT_PROVISIONED:
-        status = Status::ERROR_DRM_NOT_PROVISIONED;
-        break;
-    case android::ERROR_DRM_RESOURCE_BUSY:
-        status = Status::ERROR_DRM_RESOURCE_BUSY;
-        break;
-    case android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION:
-        status = Status::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
-        break;
-    case android::ERROR_DRM_DEVICE_REVOKED:
-        status = Status::ERROR_DRM_DEVICE_REVOKED;
-        break;
-    case android::ERROR_DRM_DECRYPT:
-        status = Status::ERROR_DRM_DECRYPT;
-        break;
-    default:
-        ALOGW("Unable to convert legacy status: %d, defaulting to UNKNOWN",
-            mediaError);
-        status = Status::ERROR_DRM_UNKNOWN;
-        break;
-    }
-    return status;
-}
-
-}  // namespace widevine
-}  // namespace V1_0
-}  // namespace drm
-}  // namespace hardware
-}  // namespace android