From d8de04fa2fdffe8f3c0258d49f169aa611092dba Mon Sep 17 00:00:00 2001
From: Marvin Ramin <marvinramin@google.com>
Date: Mon, 18 May 2020 11:04:48 +0200
Subject: CEC: Restore calling identify in any case

Bug: 156668368
Test: atest HdmiControlServiceTest
Change-Id: Id19cd4350f3ef6cf973a68fc10552c49ae42d0fc
---
 .../core/java/com/android/server/hdmi/HdmiControlService.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 549e33608a78..9de95abafdda 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -2208,8 +2208,12 @@ public class HdmiControlService extends SystemService {
         public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {
             enforceAccessPermission();
             long token = Binder.clearCallingIdentity();
-            HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);
-            Binder.restoreCallingIdentity(token);
+            try {
+                HdmiControlService.this.setHdmiCecVolumeControlEnabled(
+                        isHdmiCecVolumeControlEnabled);
+            } finally {
+                Binder.restoreCallingIdentity(token);
+            }
         }
 
         @Override
-- 
cgit v1.2.3-59-g8ed1b