diff options
| author | David Christie <dnchrist@google.com> | 2014-09-17 21:43:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 21:43:50 +0000 |
| commit | 6c65c49f31f6a618e05c23b89ed659f5d4abbe94 (patch) | |
| tree | 5762094cb725e26e59de77dd4ce2735fde6dbb28 /location | |
| parent | 8424665e0e7678beeed01009e63f466adbc93929 (diff) | |
| parent | 709aecb3ac3ab4f12c4234eabfaa54b4225940f9 (diff) | |
| download | frameworks_base-6c65c49f31f6a618e05c23b89ed659f5d4abbe94.zip frameworks_base-6c65c49f31f6a618e05c23b89ed659f5d4abbe94.tar.gz frameworks_base-6c65c49f31f6a618e05c23b89ed659f5d4abbe94.tar.bz2 | |
am ef52db95: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev
* commit 'ef52db9536b0aef77a1543ca3a97a4ad43a70e9a':
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); |