From b40f2edd7fad4caa4ccc7a28ec681bc56d20fae3 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Tue, 16 Feb 2021 12:13:52 -0800
Subject: [PATCH] Add a role for Shell.

This is essential for granting `internal|role` permissions to shell,
so that we have a way to test APIs protected by such permissions in
CTS.

Bug: 158736025
Test: adb shell dumpsys role
Change-Id: I15ff5f50f2a96ae8e2d6309a25a8d93558dfa5df
---
 core/api/system-current.txt    | 1 +
 core/res/res/values/config.xml | 2 ++
 core/res/res/values/public.xml | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 7436cdcf01edc..f2f89f78c48d7 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -341,6 +341,7 @@ package android {
     field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
     field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
     field public static final int config_systemGallery = 17039399; // 0x1040027
+    field public static final int config_systemShell = 17039402; // 0x104002a
   }
 
   public static final class R.style {
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b7c755ef7f6b3..dd048f3e09932 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1946,6 +1946,8 @@
     <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 shell role. -->
+    <string name="config_systemShell" translatable="false">com.android.shell</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 068987ec8afe8..bc6315b773a0f 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3120,6 +3120,8 @@
     <public name="config_systemAutomotiveCluster" />
     <!-- @hide @SystemApi @TestApi -->
     <public name="config_systemAutomotiveProjection" />
+    <!-- @hide @SystemApi -->
+    <public name="config_systemShell" />
   </public-group>
 
   <public-group type="id" first-id="0x01020055">