diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-29 16:12:49 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-04-02 22:35:29 +0000 |
| commit | 21cdef883cc867db55340b25d5c95e19b12ab383 (patch) | |
| tree | 93d1444ebe783f53f5f0ae2647592723b27b3fb8 /telecomm/java/android/telecom/Conference.java | |
| parent | 7deab3736bb5f3a92be8ac820096926dce2366ad (diff) | |
| parent | d1d45f856fdf68835f5b42eacecab44e6dfa8545 (diff) | |
Merge SP1A.210329.001
Change-Id: I1e21c5890b5b2e2f2855f09960bc8eec8aa922bf
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index dc2fb948fdbe..f84dd7b0bb17 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -338,7 +338,7 @@ public abstract class Conference extends Conferenceable { * * @param videoState The video state in which to answer the connection. */ - public void onAnswer(int videoState) {} + public void onAnswer(@VideoProfile.VideoState int videoState) {} /** * Notifies this Conference, which is in {@code STATE_RINGING}, of |