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

Commit de3051c0 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Fix reentry deadlock in LMS 

Calls on main thread should be forwarded to bg thread.

Bug: 121035812
Test: Manually
Change-Id: Ie0136d09101cfd5408af0263478725e8e717d7e3
parent be5eb176

services/core/java/com/android/server/LocationManagerService.java

+8 −6
Original line number Diff line number Diff line
@@ -299,12 +299,14 @@ public class LocationManagerService extends ILocationManager.Stub { 
            AppOpsManager.OnOpChangedListener callback

                    = new AppOpsManager.OnOpChangedInternalListener() {

                public void onOpChanged(int op, String packageName) {

                            mLocationHandler.post(() -> {

                                synchronized (mLock) {

                                    for (Receiver receiver : mReceivers.values()) {

                                        receiver.updateMonitoring(true);

                                    }

                                    applyAllProviderRequirementsLocked();

                                }

                            });

                }

            };

            mAppOps.startWatchingMode(AppOpsManager.OP_COARSE_LOCATION, null,