commit 709aecb3ac3ab4f12c4234eabfaa54b4225940f9
author David Christie <dnchrist@google.com> Wed Sep 17 21:31:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 21:31:03 2014 +0000
tree 338923eca4d892ae88676e9f5e5dc421f96f6192
parent 658864a610bb572f52855010c5e0aa5480228176
parent 61ee1eda0afb78c4ded09ac516f58283191e38df

am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev

* commit 'b2e914287fc6a7cc4894ea67ec527830c53f0039':
  Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515

location/java/android/location/LocationManager.java

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 @@
 
 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 @@
      *
      * @hide
      */
+    @SystemApi
     public void requestLocationUpdates(LocationRequest request, LocationListener listener,
             Looper looper) {
         checkListener(listener);
@@ -835,6 +837,7 @@
      *
      * @hide
      */
+    @SystemApi
     public void requestLocationUpdates(LocationRequest request, PendingIntent intent) {
         checkPendingIntent(intent);
         requestLocationUpdates(request, null, null, intent);