diff options
| author | 2021-02-10 20:06:16 +0000 | |
|---|---|---|
| committer | 2021-02-10 20:06:16 +0000 | |
| commit | 444fd9185caef69cebd14a75d15bdd9b576dd4cc (patch) | |
| tree | 57a07e1caf6d637e45a9a83a24caca584dd6a47e | |
| parent | 9b6c4030096934829f726e1125190ddfcc41ae50 (diff) | |
| parent | 349d9ac00605a962d73f2a80db447ee1583bb592 (diff) | |
Merge "Revert "Define video-call-app config option"" into sc-dev
| -rw-r--r-- | core/api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/api/test-current.txt | 3 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | 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 dffa0cc315ae..bfdce373a47e 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 5d0cea56a2d4..06110319cb35 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -54,9 +54,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 40c5206b86d8..46f928df323c 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3118,8 +3118,6 @@ <!-- @hide @SystemApi @TestApi --> <public name="config_systemAutomotiveCluster" /> <!-- @hide @SystemApi @TestApi --> - <public name="config_systemVideoCall" /> - <!-- @hide @SystemApi @TestApi --> <public name="config_systemAutomotiveProjection" /> </public-group> |