Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8 am: 98c1646443 am: 4ec5b2f0ff

Browse Source 
Change-Id: I939ba1ae9f42a575553fb331d82ac7d946afa34d
This commit is contained in:
Automerger Merge Worker
2020-03-03 03:23:00 +00:00
parent 644cdfa4d4 4ec5b2f0ff
commit 5d2e7f95e9
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
location/java/android/location/LocationManager.java
View File

@@ -2562,22 +2562,28 @@ public class LocationManager {
mRemoteCancellationSignal = remoteCancellationSignal; mRemoteCancellationSignal = remoteCancellationSignal;
} }
public synchronized void cancel() { public void cancel() {
mExecutor = null; ICancellationSignal cancellationSignal;
mConsumer = null; synchronized (this) {
mExecutor = null;
mConsumer = null;
if (mAlarmManager != null) { if (mAlarmManager != null) {
mAlarmManager.cancel(this); mAlarmManager.cancel(this);
mAlarmManager = null; mAlarmManager = null;
}
// ensure only one cancel event will go through
cancellationSignal = mRemoteCancellationSignal;
mRemoteCancellationSignal = null;
} }
if (mRemoteCancellationSignal != null) { if (cancellationSignal != null) {
try { try {
mRemoteCancellationSignal.cancel(); cancellationSignal.cancel();
} catch (RemoteException e) { } catch (RemoteException e) {
// ignore // ignore
} }
mRemoteCancellationSignal = null;
} }
} }