From c4f8397de569125e4e2ca26db558c48d01efc1c2 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Mon, 27 Dec 2021 18:08:38 -0800
Subject: [PATCH] Clear binder identity before releasing wakelock

Bug: 206340085
Test: manual
Change-Id: If80a10fcb376f43c660b897727999e6febdaace3
---
 .../server/location/provider/LocationProviderManager.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java
index cde99b4ba5d87..3c5c5dd0dd143 100644
--- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java
+++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java
@@ -2846,10 +2846,13 @@ public class LocationProviderManager extends
 
         @Override
         public void sendResult(Bundle data) {
+            final long identity = Binder.clearCallingIdentity();
             try {
                 mWakeLock.release();
             } catch (RuntimeException e) {
                 Log.e(TAG, "wakelock over-released by " + mIdentity, e);
+            } finally {
+                Binder.restoreCallingIdentity(identity);
             }
         }
     }