commit fae54522d71e3d37725134f463d54de384b29d9f
author Joy Babafemi <jbabs@google.com> Tue Sep 21 19:42:36 2021 +0000
committer Joy Babafemi <jbabs@google.com> Tue Sep 21 19:55:36 2021 +0000
tree 9ec4f5c63d9f141e75d581646647f53e1e55a8bc
parent 2c25dc37ee7173e0d0f732b78d399b79d4fad5b5

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

diff --git a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
index da11a9a..8d2c80a 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 @@
             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;
     }