From fae54522d71e3d37725134f463d54de384b29d9f Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Tue, 21 Sep 2021 19:42:36 +0000
Subject: [PATCH] DO NOT MERGE: Clear calling context when adding UWB default
 setting.

Bug: 200346828
Test: Manual
Change-Id: I12579263fe0edba16c20a8a152688cd671d66858
---
 services/uwb/java/com/android/server/uwb/UwbServiceImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
index da11a9acf2c12..8d2c80a5677b4 100644
--- a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
+++ b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
@@ -236,7 +236,12 @@ public class UwbServiceImpl extends IUwbAdapter.Stub implements IBinder.DeathRec
             throw new IllegalStateException("No vendor service found!");
         }
         Log.i(TAG, "Retrieved vendor service");
+        long token = Binder.clearCallingIdentity();
+        try {
         mVendorUwbAdapter.setEnabled(mUwbInjector.isPersistedUwbStateEnabled());
+        } finally {
+          Binder.restoreCallingIdentity(token);
+        }
         linkToVendorServiceDeath();
         return mVendorUwbAdapter;
     }