Merge "Remove deprecated API launchManageBlockedNumbersActivity" into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index b5fb23a..2df13bb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36621,7 +36621,6 @@
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 b939a66..b7ac148 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -39290,7 +39290,6 @@
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 ddf787b..200d719 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36693,7 +36693,6 @@
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 4fa8fe9..6eafb90 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1433,25 +1433,6 @@
}
/**
- * 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.
* <p> The activity will display the UI to manage blocked numbers only if
diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
index 3c250f1..871565d 100644
--- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
+++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl
@@ -246,12 +246,6 @@
boolean setDefaultDialer(in String packageName);
/**
- * @see TelecomServiceImpl#launchManageBlockedNumbersActivity
- **/
- // TODO: Delete this.
- void launchManageBlockedNumbersActivity(in String callingPackageName);
-
- /**
* @see TelecomServiceImpl#createManageBlockedNumbersIntent
**/
Intent createManageBlockedNumbersIntent();