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

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

Merge "Add TestApi annotations to LocationManager"

parents 250bd273 ac1879ab

api/test-current.txt

+27 −0
Original line number Diff line number Diff line
@@ -800,6 +800,33 @@ package android.location { 


  public class LocationManager {

    method public String[] getBackgroundThrottlingWhitelist();

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(android.location.LocationRequest, android.location.LocationListener, android.os.Looper);

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

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

  }



  public final class LocationRequest implements android.os.Parcelable {

    method public static android.location.LocationRequest create();

    method public int describeContents();

    method public long getExpireAt();

    method public long getFastestInterval();

    method public long getInterval();

    method public int getNumUpdates();

    method public int getQuality();

    method public android.location.LocationRequest setExpireAt(long);

    method public android.location.LocationRequest setExpireIn(long);

    method public android.location.LocationRequest setFastestInterval(long);

    method public android.location.LocationRequest setInterval(long);

    method public android.location.LocationRequest setNumUpdates(int);

    method public android.location.LocationRequest setQuality(int);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int ACCURACY_BLOCK = 102; // 0x66

    field public static final int ACCURACY_CITY = 104; // 0x68

    field public static final int ACCURACY_FINE = 100; // 0x64

    field public static final android.os.Parcelable.Creator<android.location.LocationRequest> CREATOR;

    field public static final int POWER_HIGH = 203; // 0xcb

    field public static final int POWER_LOW = 201; // 0xc9

    field public static final int POWER_NONE = 200; // 0xc8

  }



}

location/java/android/location/LocationManager.java

+3 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ public class LocationManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})

    public void requestLocationUpdates(LocationRequest request, LocationListener listener,

            Looper looper) {
@@ -963,6 +964,7 @@ public class LocationManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})

    public void requestLocationUpdates(LocationRequest request, PendingIntent intent) {

        checkPendingIntent(intent);
@@ -1293,6 +1295,7 @@ public class LocationManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(WRITE_SECURE_SETTINGS)

    public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) {

        Settings.Secure.putIntForUser(

location/java/android/location/LocationRequest.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.location; 
import android.Manifest;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;
@@ -90,6 +91,7 @@ import android.util.TimeUtils; 
 * @hide

 */

@SystemApi

@TestApi

public final class LocationRequest implements Parcelable {

    /**

     * Used with {@link #setQuality} to request the most accurate locations available.