diff options
| author | David Christie <dnchrist@google.com> | 2014-09-17 21:20:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 21:20:27 +0000 |
| commit | 61ee1eda0afb78c4ded09ac516f58283191e38df (patch) | |
| tree | 639c91ca1ae2607b66e2fe942cc9b7da1ddb5930 /location/java | |
| parent | fd20f196b12fbb6934283baadb855837f4215b40 (diff) | |
| parent | 4bd34887324b90478ee89358697c543dca9cf4dc (diff) | |
| download | frameworks_base-61ee1eda0afb78c4ded09ac516f58283191e38df.zip frameworks_base-61ee1eda0afb78c4ded09ac516f58283191e38df.tar.gz frameworks_base-61ee1eda0afb78c4ded09ac516f58283191e38df.tar.bz2 | |
Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
Diffstat (limited to 'location/java')
| -rw-r--r-- | location/java/android/location/LocationManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 2c805bb..0445869 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -18,6 +18,7 @@ package android.location; import com.android.internal.location.ProviderProperties; +import android.annotation.SystemApi; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -808,6 +809,7 @@ public class LocationManager { * * @hide */ + @SystemApi public void requestLocationUpdates(LocationRequest request, LocationListener listener, Looper looper) { checkListener(listener); @@ -835,6 +837,7 @@ public class LocationManager { * * @hide */ + @SystemApi public void requestLocationUpdates(LocationRequest request, PendingIntent intent) { checkPendingIntent(intent); requestLocationUpdates(request, null, null, intent); |