Update AOSP Dialer source from internal google3 repository at

cl/150756069

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150756069 (3/21/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I0888b5db52efb28eb8194600e0c7804592f975f3

4 files changed, 23 insertions, 0 deletions

diff --git a/java/com/android/incallui/videotech/VideoTech.java b/java/com/android/incallui/videotech/VideoTech.java
index fb2641793..bd957b699 100644
--- a/java/com/android/incallui/videotech/VideoTech.java
+++ b/java/com/android/incallui/videotech/VideoTech.java
@@ -27,6 +27,12 @@ public interface VideoTech {
 
   boolean isTransmittingOrReceiving();
 
+  /**
+   * Determines if the answer video UI should open the camera directly instead of letting the video
+   * tech manage the camera.
+   */
+  boolean isSelfManagedCamera();
+
   void onCallStateChanged(int newState);
 
   @SessionModificationState
diff --git a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
index bc8db4c07..c76043540 100644
--- a/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
+++ b/java/com/android/incallui/videotech/empty/EmptyVideoTech.java
@@ -32,6 +32,11 @@ public class EmptyVideoTech implements VideoTech {
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    return false;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {}
 
   @Override
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index 890e5c80c..a37500c3b 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -58,6 +58,13 @@ public class ImsVideoTech implements VideoTech {
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    // Return false to indicate that the answer UI shouldn't open the camera itself.
+    // For IMS Video the modem is responsible for opening the camera.
+    return false;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {
     if (!isAvailable()) {
       return;
diff --git a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
index 2cb43036f..1e951408c 100644
--- a/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
+++ b/java/com/android/incallui/videotech/rcs/RcsVideoShare.java
@@ -65,6 +65,11 @@ public class RcsVideoShare implements VideoTech, CapabilitiesListener, VideoShar
   }
 
   @Override
+  public boolean isSelfManagedCamera() {
+    return true;
+  }
+
+  @Override
   public void onCallStateChanged(int newState) {
     if (newState == Call.STATE_DISCONNECTING) {
       enrichedCallManager.unregisterVideoShareListener(this);