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

Commit 53f4d28b authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Android (Google) Code Review
Browse files

Merge "Remove unused API"

parents d20eef82 ec2718d4

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -3317,7 +3317,6 @@ package android.location { 
    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public int getGnssBatchSize();

    method public int getGnssCapabilities();

    method @Nullable public String getLocationControllerExtraPackage();

    method @Nullable public String getNetworkProviderPackage();

    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void injectGnssMeasurementCorrections(@NonNull android.location.GnssMeasurementCorrections);

    method public boolean isLocationControllerExtraPackageEnabled();

    method public boolean isLocationEnabledForUser(android.os.UserHandle);

config/hiddenapi-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V 
Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager;

Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I

Landroid/location/ILocationManager;->getAllProviders()Ljava/util/List;

Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/String;

Landroid/location/INetInitiatedListener$Stub;-><init>()V

Landroid/location/INetInitiatedListener;->sendNiResponse(II)Z

Landroid/location/LocationManager$ListenerTransport;-><init>(Landroid/location/LocationManager;Landroid/location/LocationListener;Landroid/os/Looper;)V

location/java/android/location/ILocationManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ interface ILocationManager 
    List<String> getProviders(in Criteria criteria, boolean enabledOnly);

    String getBestProvider(in Criteria criteria, boolean enabledOnly);

    ProviderProperties getProviderProperties(String provider);

    String getNetworkProviderPackage();

    boolean isProviderPackage(String packageName);



    void setLocationControllerExtraPackage(String packageName);

location/java/android/location/LocationManager.java

+0 −15
Original line number Diff line number Diff line
@@ -2409,21 +2409,6 @@ public class LocationManager { 
        }

    }



    /**

     * Return the package that implements the {@link #NETWORK_PROVIDER} functionality.

     *

     * @hide

     */

    @SystemApi

    public @Nullable String getNetworkProviderPackage() {

        try {

            return mService.getNetworkProviderPackage();

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            return null;

        }

    }



    /**

     * Returns true if the given package name matches a location provider package, and false

     * otherwise.

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

+0 −16
Original line number Diff line number Diff line
@@ -2881,22 +2881,6 @@ public class LocationManagerService extends ILocationManager.Stub { 
        }

    }



    @Override

    public String getNetworkProviderPackage() {

        synchronized (mLock) {

            LocationProvider provider = getLocationProviderLocked(NETWORK_PROVIDER);

            if (provider == null) {

                return null;

            }

            List<String> packages = provider.getPackagesLocked();

            if (packages.isEmpty()) {

                return null;

            } else {

                return packages.get(0);

            }

        }

    }



    @Override

    public boolean isProviderPackage(String packageName) {

        synchronized (mLock) {