commit 74568130ce4fd16ae38eb75bf482f5162d5216eb
author Android Build Merger (Role) <android-build-merger@google.com> Mon Apr 10 23:31:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 10 23:31:51 2017 +0000
tree d47de984db8b94340cf107dadda180389150eeca
parent c9b051fc18fbac5beb91c9c4e75b62764a046497
parent f72fd56b0605ec57a0d0527243731463d8b4893e

Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a am: 599a4c7326" into oc-dev-plus-aosp

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e95c931..cc17fae 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -40069,7 +40069,7 @@
     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 int getDataNetworkType();
     method public int getDataState();

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ef675ae..213f8ec 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -43554,7 +43554,7 @@
     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();

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 0602800..ff3dd82 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -40284,7 +40284,7 @@
     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 int getDataNetworkType();
     method public int getDataState();

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 1fd1929..9240247e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1087,14 +1087,15 @@
      * 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();