diff options
| author | 2014-09-17 21:59:29 +0000 | |
|---|---|---|
| committer | 2014-09-17 21:59:29 +0000 | |
| commit | 57ac96ca358c6ccb92cb4eaf5146ee763d1038a5 (patch) | |
| tree | 9c3ad88722dc9551e17c20b5b4f6defdbe3f1cc3 /location/java | |
| parent | 49e6cece96a8c0c27b0fd8236fa1afcdbaa96277 (diff) | |
| parent | 2e0d1cb45834e98e029b4ba4fd6b636b28c12269 (diff) | |
am 9f115938: am 4233ee4b: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
* commit '9f115938a1d81b664daccec6abdb0dd6d0d34aa2':
Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515
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 2c805bbe7835..04458697afdd 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); |