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

Commit b183da57 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make get/setCallerNumberVerificationStatus final." am: 4cbb2886 am:... 

Merge "Make get/setCallerNumberVerificationStatus final." am: 4cbb2886 am: 329d286b am: 83d8de2f

Change-Id: I209101a92935f377b3e562f65b9692113a6d9b03
parents efde895c 83d8de2f

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -45646,7 +45646,7 @@ package android.telecom { 
    method public final android.telecom.CallAudioState getCallAudioState();

    method public final String getCallerDisplayName();

    method public final int getCallerDisplayNamePresentation();

    method public int getCallerNumberVerificationStatus();

    method public final int getCallerNumberVerificationStatus();

    method public final android.telecom.Conference getConference();

    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();

    method public final int getConnectionCapabilities();
@@ -45699,7 +45699,7 @@ package android.telecom { 
    method public final void setAudioModeIsVoip(boolean);

    method public final void setAudioRoute(int);

    method public final void setCallerDisplayName(String, int);

    method public void setCallerNumberVerificationStatus(int);

    method public final void setCallerNumberVerificationStatus(int);

    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

telecomm/java/android/telecom/Connection.java

+2 −2
Original line number Diff line number Diff line
@@ -3576,7 +3576,7 @@ public abstract class Connection extends Conferenceable { 
     * ATIS-1000082.

     * @return the verification status.

     */

    public @VerificationStatus int getCallerNumberVerificationStatus() {

    public final @VerificationStatus int getCallerNumberVerificationStatus() {

        return mCallerNumberVerificationStatus;

    }
@@ -3588,7 +3588,7 @@ public abstract class Connection extends Conferenceable { 
     * by

     * {@link ConnectionService#onCreateIncomingConnection(PhoneAccountHandle, ConnectionRequest)}.

     */

    public void setCallerNumberVerificationStatus(

    public final void setCallerNumberVerificationStatus(

            @VerificationStatus int callerNumberVerificationStatus) {

        mCallerNumberVerificationStatus = callerNumberVerificationStatus;

    }