diff options
| author | 2023-06-08 15:32:55 +0000 | |
|---|---|---|
| committer | 2023-06-08 15:32:55 +0000 | |
| commit | 24a772e9fc645b5f97082aa1a55d91766e379136 (patch) | |
| tree | 0475c486239bfdfc3b730c4adcd907d2f7d601c5 | |
| parent | ef66d07bec17ed214bd93e1c67e48b4117bf3b42 (diff) | |
| parent | 816308af9960c468b07777c08ab88b856dd981ad (diff) | |
Merge "Clear identity when releasing display resources." into udc-dev am: f38af45079 am: 816308af99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23588842
Change-Id: Id7da45af74000a275a03739701185066a41236cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index 6b55d7ed4d56..cd2f844294e3 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -987,8 +987,12 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub "Virtual device doesn't have a virtual display with ID " + displayId); } - releaseOwnedVirtualDisplayResources(virtualDisplayWrapper); - + final long ident = Binder.clearCallingIdentity(); + try { + releaseOwnedVirtualDisplayResources(virtualDisplayWrapper); + } finally { + Binder.restoreCallingIdentity(ident); + } } /** |