From 349d9ac00605a962d73f2a80db447ee1583bb592 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Wed, 10 Feb 2021 00:52:50 +0000
Subject: Revert "Define video-call-app config option"

Revert "Add video call role"

Revert submission 12702660-VideoChatRole

Reason for revert: Feature reverted
Reverted Changes:
I07f96521c:Add video call role
I02e985f6b:Allow default video chat app role
Iaa3890228:Define video-call-app config option

Bug: 168431157
Change-Id: I7e6ee33f31fca41fc7519b04e7f4dd649887e342
---
 core/api/system-current.txt    | 3 +--
 core/api/test-current.txt      | 3 +--
 core/res/res/values/config.xml | 2 --
 core/res/res/values/public.xml | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 058e5a872b6a..ab5e364073af 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -338,9 +338,8 @@ package android {
     field public static final int config_helpPackageNameKey = 17039387; // 0x104001b
     field public static final int config_helpPackageNameValue = 17039388; // 0x104001c
     field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
-    field public static final int config_systemAutomotiveProjection = 17039402; // 0x104002a
+    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
     field public static final int config_systemGallery = 17039399; // 0x1040027
-    field public static final int config_systemVideoCall = 17039401; // 0x1040029
   }
 
   public static final class R.style {
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index e39b2b856661..c84aa7d98185 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -53,9 +53,8 @@ package android {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultDialer = 17039395; // 0x1040023
     field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
-    field public static final int config_systemAutomotiveProjection = 17039402; // 0x104002a
+    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
     field public static final int config_systemGallery = 17039399; // 0x1040027
-    field public static final int config_systemVideoCall = 17039401; // 0x1040029
   }
 
 }
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index beae9353a10f..09ca12aa9744 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1946,8 +1946,6 @@
     <string name="config_systemAutomotiveProjection" translatable="false"></string>
     <!-- The name of the package that will hold the system cluster service role. -->
     <string name="config_systemAutomotiveCluster" translatable="false"></string>
-    <!-- The name of the package that will hold the system video call role. -->
-    <string name="config_systemVideoCall" translatable="false"></string>
 
     <!-- The name of the package that will be allowed to change its components' label/icon. -->
     <string name="config_overrideComponentUiPackage" translatable="false"></string>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index d3f3ebd7c3d9..20235c9220b8 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3117,8 +3117,6 @@
     <!-- @hide @SystemApi @TestApi -->
     <public name="config_systemAutomotiveCluster" />
     <!-- @hide @SystemApi @TestApi -->
-    <public name="config_systemVideoCall" />
-    <!-- @hide @SystemApi @TestApi -->
     <public name="config_systemAutomotiveProjection" />
   </public-group>
 
-- 
cgit v1.2.3-59-g8ed1b