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

Commit c0362c5d authored by Evan Charlton's avatar Evan Charlton Committed by Android Git Automerger
Browse files

am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 

* commit '10dff0a7':
  Re-add Connection.getCallCapabilities
parents 5125dc1c 10dff0a7

telecomm/java/android/telecom/Connection.java

+5 −0
Original line number Diff line number Diff line
@@ -838,6 +838,11 @@ public abstract class Connection implements IConferenceable { 
        return mConnectionCapabilities;

    }



    /** @hide */

    @SystemApi @Deprecated public final int getCallCapabilities() {

        return getConnectionCapabilities();

    }



    /**

     * Sets the value of the {@link #getAddress()} property.

     *