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

Commit c3fabdca authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Expose FUSED_PROVIDER to test API."

parents 0bfdf247 621e4cf5

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -1151,6 +1151,7 @@ package android.location { 
    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.location.LocationListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@Nullable android.location.LocationRequest, @NonNull android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean, @NonNull android.os.UserHandle);

    field public static final String FUSED_PROVIDER = "fused";

  }

  }





  public final class LocationRequest implements android.os.Parcelable {

  public final class LocationRequest implements android.os.Parcelable {

location/java/android/location/LocationManager.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,7 @@ public class LocationManager { 
     *

     *

     * @hide

     * @hide

     */

     */

    @TestApi

    public static final String FUSED_PROVIDER = "fused";

    public static final String FUSED_PROVIDER = "fused";





    /**

    /**