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

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

Merge "Fix deadlock for system location clients" into rvc-dev am: b297119c... 

Merge "Fix deadlock for system location clients" into rvc-dev am: b297119c am: 243af9e9 am: 27ec4f69 am: aba492eb

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

Change-Id: I9a84e3a8219836513d70369c30c5390467d679d1
parents c703611d aba492eb

location/java/android/location/LocationManager.java

+11 −9
Original line number Diff line number Diff line
@@ -2448,9 +2448,15 @@ public class LocationManager { 
        }



        public void cancel() {

            remove();

        }



        private Consumer<Location> remove() {

            Consumer<Location> consumer;

            ICancellationSignal cancellationSignal;

            synchronized (this) {

                mExecutor = null;

                consumer = mConsumer;

                mConsumer = null;



                if (mAlarmManager != null) {
@@ -2470,6 +2476,8 @@ public class LocationManager { 
                    // ignore

                }

            }



            return consumer;

        }



        public void fail() {
@@ -2528,18 +2536,12 @@ public class LocationManager { 
        }



        private void acceptResult(Location location) {

            Consumer<Location> consumer;

            synchronized (this) {

                if (mConsumer == null) {

                    return;

                }

                consumer = mConsumer;

                cancel();

            }



            Consumer<Location> consumer = remove();

            if (consumer != null) {

                consumer.accept(location);

            }

        }

    }



    private static class NmeaAdapter extends GnssStatus.Callback implements OnNmeaMessageListener {