Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5d6c82 authored by Abhijith Shastry's avatar Abhijith Shastry Committed by android-build-merger
Browse files

Merge "Remove deprecated API launchManageBlockedNumbersActivity" into nyc-dev am: 7f376b9e 

am: 306c2517

* commit '306c2517':
  Remove deprecated API launchManageBlockedNumbersActivity

Change-Id: I64ac10f5937b99c3a08a5b861ef0f6f6c0c9dbd8
parents 4fde3f34 306c2517

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -36626,7 +36626,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);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -39295,7 +39295,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);

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -36698,7 +36698,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);

telecomm/java/android/telecom/TelecomManager.java

+0 −19
Original line number Diff line number Diff line
@@ -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.

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+0 −6
Original line number Diff line number Diff line
@@ -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

    **/