commit 089e99ee4d8d01f95c86cbc859cc2c4a9dccbfc8
author Tyler Gunn <tgunn@google.com> Thu Jun 30 06:20:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 30 06:20:42 2016 +0000
tree ad422b278886e52a0b012c753e3222eea88be0a0
parent ce7ff88bc2c5334d9985308136dd672b9cdb90d0
parent c242ceb40625f0c41a3e7188e6726c772d805032

Merge "Add missing setPulling() method in Connection." into nyc-mr1-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 0afa7bc..760e3e3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36288,6 +36288,7 @@
     method public final void setNextPostDialChar(char);
     method public final void setOnHold();
     method public final void setPostDialWait(java.lang.String);
+    method public final void setPulling();
     method public final void setRingbackRequested(boolean);
     method public final void setRinging();
     method public final void setStatusHints(android.telecom.StatusHints);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 17d5aba..90840b3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -39138,6 +39138,7 @@
     method public final void setNextPostDialChar(char);
     method public final void setOnHold();
     method public final void setPostDialWait(java.lang.String);
+    method public final void setPulling();
     method public final void setRingbackRequested(boolean);
     method public final void setRinging();
     method public final void setStatusHints(android.telecom.StatusHints);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 3ce906a..6b9aaaf 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -36366,6 +36366,7 @@
     method public final void setNextPostDialChar(char);
     method public final void setOnHold();
     method public final void setPostDialWait(java.lang.String);
+    method public final void setPulling();
     method public final void setRingbackRequested(boolean);
     method public final void setRinging();
     method public final void setStatusHints(android.telecom.StatusHints);

telecomm/java/android/telecom/Connection.java

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 4ce4ddd..766e930 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -1672,6 +1672,16 @@
     }
 
     /**
+     * Sets state to pulling (e.g. the connection is being pulled to the local device from another
+     * device).  Only applicable for {@link Connection}s with
+     * {@link Connection#PROPERTY_IS_EXTERNAL_CALL} and {@link Connection#CAPABILITY_CAN_PULL_CALL}.
+     */
+    public final void setPulling() {
+        checkImmutable();
+        setState(STATE_PULLING_CALL);
+    }
+
+    /**
      * Sets state to be on hold.
      */
     public final void setOnHold() {