From c12d6c5983a11ca989a85dd553d11c3583ff7aaf Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Fri, 7 Apr 2017 10:56:05 -0700
Subject: [PATCH] Deprecate TelephonyManager.getCellLocation()

This API has been long-marked for deprecation. It has numerous problems:
-It does not support LTE
-It returns a limited subset of information
-It uses old (and poorly-chosen) sentinel values for fields that are
 not provided.

Bug: 36076138
Test: compilation
Change-Id: I87004710e5d046d4534ad3a0a938540440b0e83b
---
 api/current.txt                                        | 2 +-
 api/system-current.txt                                 | 2 +-
 api/test-current.txt                                   | 2 +-
 telephony/java/android/telephony/TelephonyManager.java | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index e21a9fd3e31a8..0db3f28f451bd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -38160,7 +38160,7 @@ package android.telephony {
     method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
     method public int getCallState();
     method public android.os.PersistableBundle getCarrierConfig();
-    method public android.telephony.CellLocation getCellLocation();
+    method public deprecated android.telephony.CellLocation getCellLocation();
     method public int getDataActivity();
     method public boolean getDataEnabled();
     method public int getDataNetworkType();
diff --git a/api/system-current.txt b/api/system-current.txt
index 6b0d23625dedc..0537325f023e0 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -41373,7 +41373,7 @@ package android.telephony {
     method public java.lang.String getCdmaMdn(int);
     method public java.lang.String getCdmaMin();
     method public java.lang.String getCdmaMin(int);
-    method public android.telephony.CellLocation getCellLocation();
+    method public deprecated android.telephony.CellLocation getCellLocation();
     method public int getCurrentPhoneType();
     method public int getCurrentPhoneType(int);
     method public int getDataActivity();
diff --git a/api/test-current.txt b/api/test-current.txt
index c5090b1684ca3..eff60ac959a36 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -38259,7 +38259,7 @@ package android.telephony {
     method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
     method public int getCallState();
     method public android.os.PersistableBundle getCarrierConfig();
-    method public android.telephony.CellLocation getCellLocation();
+    method public deprecated android.telephony.CellLocation getCellLocation();
     method public int getDataActivity();
     method public boolean getDataEnabled();
     method public int getDataNetworkType();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index f3c72af62af79..26d46ac9cb0c5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1035,14 +1035,15 @@ public class TelephonyManager {
      * this method will return null. The implementation must not to try add LTE
      * identifiers into the existing cdma/gsm classes.
      *<p>
-     * In the future this call will be deprecated.
-     *<p>
      * @return Current location of the device or null if not available.
      *
      * <p>Requires Permission:
      * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or
      * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}.
+     *
+     * @deprecated use {@link #getAllCellInfo} instead, which returns a superset of this API.
      */
+    @Deprecated
     public CellLocation getCellLocation() {
         try {
             ITelephony telephony = getITelephony();