| Chunk |
|---|
| Conflicting content |
|---|
private LocationWorkerHandler mLocationHandler;
private PassiveProvider mPassiveProvider; // track passive provider for special cases
private LocationBlacklist mBlacklist;
<<<<<<< HEAD
=======
private HandlerThread mHandlerThread;
>>>>>>> 51ff6f953c8ddb89fdcdccc9799445b65556b711
// --- fields below are protected by mLock ---
// Set of providers that are explicitly enabled |
| Solution content |
|---|
private LocationWorkerHandler mLocationHandler;
private PassiveProvider mPassiveProvider; // track passive provider for special cases
private LocationBlacklist mBlacklist;
// --- fields below are protected by mLock ---
// Set of providers that are explicitly enabled |
| File |
|---|
| LocationManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |