Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...

* changes:
  Automated g4 rollback of changelist 172154863.
  Take into account special dialable characters when grouping calls in the call log UI.
  Move more Video Share stuff to third_party
  Fix NPE in TelecomAdapter.stopForegroundNotification().
  wrapping %s in in <xliff:g> </xliff:g> tags to prevent translation
  Check AD eligibility before utilizing the feature.

2 files changed, 58 insertions, 0 deletions

diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareException.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareException.java
new file mode 100644
index 000000000..9d3a9ab23
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.enrichedcall.videoshare;
+
+/** Exceptions occurring from using DreamVideo and video share configuration. */
+public class VideoShareException extends Exception {
+
+  public VideoShareException(String message) {
+    super(message);
+  }
+}
diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareSessionListener.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareSessionListener.java
new file mode 100644
index 000000000..1e612bf2e
--- /dev/null
+++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareSessionListener.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.enrichedcall.videoshare;
+
+/** Interface for receiving updates on session initialization failure or termination. */
+public interface VideoShareSessionListener {
+
+  void onSessionTerminated(VideoShareSession session);
+
+  void onSessionInitializationFailed(VideoShareSession session, Exception e);
+
+  /**
+   * Called when a session hasn't received a keep-alive or video packet within the timeout time
+   * period.
+   *
+   * @param session The session that timed out
+   */
+  void onSessionTimedOut(VideoShareSession session);
+}