commit 4e21cc8205b1952eaa3f7b5ab4e74b8e447bf3da
author Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Mon Feb 06 19:06:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 06 19:06:48 2023 +0000
tree 41f8446e6bfa85a4393b499f372c7ba5d736561b
parent 74e8d50c988f6261565653a55c4ffbd9586da317
parent 46720e796c060c6d0c122e424fb9c7ca6735865e

CAS: Add openSessionDefault am: 46720e796c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418320

Change-Id: I0627dbe8f94d04a8ecccd2f1e25da9d7fd52943e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/java/android/media/MediaCas.java

diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java
index 015602e..6141429 100644
--- a/media/java/android/media/MediaCas.java
+++ b/media/java/android/media/MediaCas.java
@@ -1126,7 +1126,17 @@
         int sessionResourceHandle = getSessionResourceHandle();
 
         try {
-            if (mICasHidl != null) {
+            if (mICas != null) {
+                byte[] sessionId = mICas.openSessionDefault();
+                Session session = createFromSessionId(sessionId);
+                Log.d(TAG, "Write Stats Log for succeed to Open Session.");
+                FrameworkStatsLog.write(
+                        FrameworkStatsLog.TV_CAS_SESSION_OPEN_STATUS,
+                        mUserId,
+                        mCasSystemId,
+                        FrameworkStatsLog.TV_CAS_SESSION_OPEN_STATUS__STATE__SUCCEEDED);
+                return session;
+            } else if (mICasHidl != null) {
                 OpenSessionCallback cb = new OpenSessionCallback();
                 mICasHidl.openSession(cb);
                 MediaCasException.throwExceptionIfNeeded(cb.mStatus);