From 7b540655980b72ebb3b43affe1b64ff69ca1d918 Mon Sep 17 00:00:00 2001
From: Venkatarama Avadhani <venkatarama.avadhani@ittiam.com>
Date: Mon, 5 Dec 2022 15:04:26 +0530
Subject: [PATCH] CAS: Update ScramblingMode enum order

Move the new enum to the end, so the values of the older enums do not
change.

Bug: 230377377, 227673974, 233862815
Test: None
Change-Id: I239e2b887af5b4d668d0f8eaacc77f18049c697a
---
 .../current/android/hardware/cas/ScramblingMode.aidl   | 10 +++++-----
 cas/aidl/android/hardware/cas/ScramblingMode.aidl      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl
index e3923c7914..c73f482585 100644
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl
@@ -44,9 +44,9 @@ enum ScramblingMode {
   DVB_IDSA = 7,
   MULTI2 = 8,
   AES128 = 9,
-  AES_CBC = 10,
-  AES_ECB = 11,
-  AES_SCTE52 = 12,
-  TDES_ECB = 13,
-  TDES_SCTE52 = 14,
+  AES_ECB = 10,
+  AES_SCTE52 = 11,
+  TDES_ECB = 12,
+  TDES_SCTE52 = 13,
+  AES_CBC = 14,
 }
diff --git a/cas/aidl/android/hardware/cas/ScramblingMode.aidl b/cas/aidl/android/hardware/cas/ScramblingMode.aidl
index 9d73eba08e..2a4858a9c9 100644
--- a/cas/aidl/android/hardware/cas/ScramblingMode.aidl
+++ b/cas/aidl/android/hardware/cas/ScramblingMode.aidl
@@ -69,11 +69,6 @@ enum ScramblingMode {
      */
     AES128,
 
-    /**
-     * Advanced Encryption System (AES) Cipher Block Chaining (CBC) mode.
-     */
-    AES_CBC,
-
     /**
      * Advanced Encryption System (AES) Electronic Code Book (ECB) mode.
      */
@@ -95,4 +90,9 @@ enum ScramblingMode {
      * Engineers (SCTE) 52 mode.
      */
     TDES_SCTE52,
+
+    /**
+     * Advanced Encryption System (AES) Cipher Block Chaining (CBC) mode.
+     */
+    AES_CBC,
 }