Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Abhijith Shastry
2016-03-01 19:56:05 +00:00
committed by Android (Google) Code Review
parent d1caf8560d 6701be428c
commit 35293d2ff7
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -36420,7 +36420,7 @@ 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 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);

2
api/system-current.txt
View File

@@ -39133,7 +39133,7 @@ package android.telecom {
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);

2
api/test-current.txt
View File

@@ -36437,7 +36437,7 @@ 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 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);

1
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -1425,6 +1425,7 @@ public class TelecomManager {
* <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() {