Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8660097 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear binder identity before releasing wakelock" into sc-v2-dev am:... 

Merge "Clear binder identity before releasing wakelock" into sc-v2-dev am: addb12da am: 129e389b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16545944

Change-Id: I5db4b0efae8865af843cb2723834ec5077befc53
parents 18f92bec 129e389b

services/core/java/com/android/server/location/provider/LocationProviderManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }