diff options
| author | David Christie <dnchrist@google.com> | 2014-09-17 22:09:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 22:09:24 +0000 |
| commit | ea1653a774b70f0eef7f90ef95935e7172ba4ac1 (patch) | |
| tree | 02ad95680a30cc6661edcc3b3c181eb6c9d4e989 /location | |
| parent | 97e853d00c984e912b3989a3f56267d3181ba4dc (diff) | |
| parent | 57ac96ca358c6ccb92cb4eaf5146ee763d1038a5 (diff) | |
| download | frameworks_base-ea1653a774b70f0eef7f90ef95935e7172ba4ac1.zip frameworks_base-ea1653a774b70f0eef7f90ef95935e7172ba4ac1.tar.gz frameworks_base-ea1653a774b70f0eef7f90ef95935e7172ba4ac1.tar.bz2 | |
am 8601ffdd: am 9f115938: am 4233ee4b: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
* commit '8601ffdd4c0cf864ef3bb95cdd355512a2654656':
Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
Diffstat (limited to 'location')
| -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); |