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

Commit 54111d3c authored by Daniel Estrada Alva's avatar Daniel Estrada Alva Committed by Android (Google) Code Review
Browse files

Merge "Fix inconsistent permission check in LocationManager."

parents 7dc3b9f8 b376b3b5
Loading
Loading
Loading
Loading
+1 −12
Original line number Diff line number Diff line
@@ -1542,18 +1542,7 @@ public class LocationManagerService extends ILocationManager.Stub {
     */
    @Override
    public List<String> getAllProviders() {
        ArrayList<String> out;
        synchronized (mLock) {
            out = new ArrayList<>(mProviders.size());
            for (LocationProviderInterface provider : mProviders) {
                String name = provider.getName();
                if (LocationManager.FUSED_PROVIDER.equals(name)) {
                    continue;
                }
                out.add(name);
            }
        }

        List<String> out = getProviders(null /*criteria*/, false /*enabledOnly*/);
        if (D) Log.d(TAG, "getAllProviders()=" + out);
        return out;
    }