commit 35293d2ff7de5d98f9bc5a4417de66147f4a1cf5
author Abhijith Shastry <ashastry@google.com> Tue Mar 01 19:56:05 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 01 19:56:06 2016 +0000
tree 241567b90ab0e66e71ffbed0062bd107fb3375c8
parent d1caf8560df4860fa7fcbd63afe359990f72d9f4
parent 6701be428cc3d96dd1735238f3f4299cf5eecaed

Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8be9256..a6e8aba 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36420,7 +36420,7 @@
     method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
     method public boolean isInCall();
     method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
-    method public void launchManageBlockedNumbersActivity();
+    method public deprecated void launchManageBlockedNumbersActivity();
     method public void placeCall(android.net.Uri, android.os.Bundle);
     method public void registerPhoneAccount(android.telecom.PhoneAccount);
     method public void showInCallScreen(boolean);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 96c903c..c752f4b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -39133,7 +39133,7 @@
     method public boolean isRinging();
     method public boolean isTtySupported();
     method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
-    method public void launchManageBlockedNumbersActivity();
+    method public deprecated void launchManageBlockedNumbersActivity();
     method public void placeCall(android.net.Uri, android.os.Bundle);
     method public void registerPhoneAccount(android.telecom.PhoneAccount);
     method public void showInCallScreen(boolean);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index ebeae1c..918ac46 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36437,7 +36437,7 @@
     method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);
     method public boolean isInCall();
     method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
-    method public void launchManageBlockedNumbersActivity();
+    method public deprecated void launchManageBlockedNumbersActivity();
     method public void placeCall(android.net.Uri, android.os.Bundle);
     method public void registerPhoneAccount(android.telecom.PhoneAccount);
     method public void showInCallScreen(boolean);

telecomm/java/android/telecom/TelecomManager.java

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 857d2df..605e0d3 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1425,6 +1425,7 @@
      * <p> This method displays the UI to manage blocked numbers only if
      * {@link android.provider.BlockedNumberContract#canCurrentUserBlockNumbers(Context)} returns
      * {@code true} for the current user.
+     * @deprecated Use {@link #createManageBlockedNumbersIntent()} instead.
      */
     // TODO: Delete this.
     public void launchManageBlockedNumbersActivity() {