commit e6c853316f327679104948298d960e88a48d1e08
author Robert Shih <robertshih@google.com> Wed Mar 03 02:23:15 2021 -0800
committer Robert Shih <robertshih@google.com> Wed Mar 03 16:57:40 2021 +0000
tree 6273060337accca642055d5c50b6d60e1c064293
parent 19e822c378354094565c4f06c9e77a96cc6ce81b

libmediadrm: add ERROR_DRM_PROVISIONING_REQUEST_REJECTED

Bug: 180579631
Test: MediaDrmTest#testBadProvisioningRequest
Change-Id: I9c81c91ee408b0ffc578820bf331f46a9d483253

drm/libmediadrm/DrmUtils.cpp

diff --git a/drm/libmediadrm/DrmUtils.cpp b/drm/libmediadrm/DrmUtils.cpp
index f7e6717..4989b03 100644
--- a/drm/libmediadrm/DrmUtils.cpp
+++ b/drm/libmediadrm/DrmUtils.cpp
@@ -255,6 +255,8 @@
         return ERROR_DRM_PROVISIONING_CONFIG;
     case ::V1_4::Status::PROVISIONING_PARSE_ERROR:
         return ERROR_DRM_PROVISIONING_PARSE;
+    case ::V1_4::Status::PROVISIONING_REQUEST_REJECTED:
+        return ERROR_DRM_PROVISIONING_REQUEST_REJECTED;
     case ::V1_4::Status::RETRYABLE_PROVISIONING_ERROR:
         return ERROR_DRM_PROVISIONING_RETRY;
     case ::V1_4::Status::SECURE_STOP_RELEASE_ERROR:

media/libstagefright/include/media/stagefright/MediaErrors.h

diff --git a/media/libstagefright/include/media/stagefright/MediaErrors.h b/media/libstagefright/include/media/stagefright/MediaErrors.h
index cfd5608..d1df2ca 100644
--- a/media/libstagefright/include/media/stagefright/MediaErrors.h
+++ b/media/libstagefright/include/media/stagefright/MediaErrors.h
@@ -94,12 +94,13 @@
     ERROR_DRM_PROVISIONING_CERTIFICATE       = DRM_ERROR_BASE - 31,
     ERROR_DRM_PROVISIONING_CONFIG            = DRM_ERROR_BASE - 32,
     ERROR_DRM_PROVISIONING_PARSE             = DRM_ERROR_BASE - 33,
-    ERROR_DRM_PROVISIONING_RETRY             = DRM_ERROR_BASE - 34,
-    ERROR_DRM_SECURE_STOP_RELEASE            = DRM_ERROR_BASE - 35,
-    ERROR_DRM_STORAGE_READ                   = DRM_ERROR_BASE - 36,
-    ERROR_DRM_STORAGE_WRITE                  = DRM_ERROR_BASE - 37,
-    ERROR_DRM_ZERO_SUBSAMPLES                = DRM_ERROR_BASE - 38,
-    ERROR_DRM_LAST_USED_ERRORCODE            = DRM_ERROR_BASE - 38,
+    ERROR_DRM_PROVISIONING_REQUEST_REJECTED  = DRM_ERROR_BASE - 34,
+    ERROR_DRM_PROVISIONING_RETRY             = DRM_ERROR_BASE - 35,
+    ERROR_DRM_SECURE_STOP_RELEASE            = DRM_ERROR_BASE - 36,
+    ERROR_DRM_STORAGE_READ                   = DRM_ERROR_BASE - 37,
+    ERROR_DRM_STORAGE_WRITE                  = DRM_ERROR_BASE - 38,
+    ERROR_DRM_ZERO_SUBSAMPLES                = DRM_ERROR_BASE - 39,
+    ERROR_DRM_LAST_USED_ERRORCODE            = ERROR_DRM_ZERO_SUBSAMPLES,
 
     ERROR_DRM_VENDOR_MAX                     = DRM_ERROR_BASE - 500,
     ERROR_DRM_VENDOR_MIN                     = DRM_ERROR_BASE - 999,
@@ -202,6 +203,7 @@
         STATUS_CASE(ERROR_DRM_PROVISIONING_CERTIFICATE);
         STATUS_CASE(ERROR_DRM_PROVISIONING_CONFIG);
         STATUS_CASE(ERROR_DRM_PROVISIONING_PARSE);
+        STATUS_CASE(ERROR_DRM_PROVISIONING_REQUEST_REJECTED);
         STATUS_CASE(ERROR_DRM_PROVISIONING_RETRY);
         STATUS_CASE(ERROR_DRM_SECURE_STOP_RELEASE);
         STATUS_CASE(ERROR_DRM_STORAGE_READ);