From 9bacdabf3e44130963890b9712840d34c494d77d Mon Sep 17 00:00:00 2001
From: Abhijith Shastry <ashastry@google.com>
Date: Fri, 1 Apr 2016 13:26:27 -0700
Subject: [PATCH] Remove deprecated API launchManageBlockedNumbersActivity

BUG: 27364137
Change-Id: Ie608c3f75d5fe353a1ba127b0da763c421401eb8
---
 api/current.txt                               |  1 -
 api/system-current.txt                        |  1 -
 api/test-current.txt                          |  1 -
 .../java/android/telecom/TelecomManager.java  | 19 -------------------
 .../internal/telecom/ITelecomService.aidl     |  6 ------
 5 files changed, 28 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 07a4f6d117d9b..d260004a5c6dc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36618,7 +36618,6 @@ package android.telecom {
     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 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);
diff --git a/api/system-current.txt b/api/system-current.txt
index e1e73e93aaccb..277dfa3c4f6db 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -39301,7 +39301,6 @@ package android.telecom {
     method public boolean isRinging();
     method public boolean isTtySupported();
     method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);
-    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);
diff --git a/api/test-current.txt b/api/test-current.txt
index 09c55b927c60e..63e8192778b8e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36690,7 +36690,6 @@ package android.telecom {
     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 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);
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 4fa8fe96a6a9e..6eafb90fbfdbc 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1432,25 +1432,6 @@ public class TelecomManager {
         return result;
     }
 
-    /**
-     * Launches the {@link android.app.Activity} to manage blocked numbers.
-     * <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() {
-        ITelecomService service = getTelecomService();
-        if (service != null) {
-            try {
-                service.launchManageBlockedNumbersActivity(mContext.getPackageName());
-            } catch (RemoteException e) {
-                Log.e(TAG, "Error calling ITelecomService#manageBlockedNumbers", e);
-            }
-        }
-    }
-
     /**
      * Creates the {@link Intent} which can be used with {@link Context#startActivity(Intent)} to
      * launch the activity to manage blocked numbers.
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 3c250f1b54fd5..871565de33c99 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -245,12 +245,6 @@ interface ITelecomService {
      */
     boolean setDefaultDialer(in String packageName);
 
-    /**
-    * @see TelecomServiceImpl#launchManageBlockedNumbersActivity
-    **/
-    // TODO: Delete this.
-    void launchManageBlockedNumbersActivity(in String callingPackageName);
-
     /**
     * @see TelecomServiceImpl#createManageBlockedNumbersIntent
     **/