summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Watkins <lesliewatkins@google.com>2022-04-30 04:34:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-30 04:34:18 +0000
commit5b66d77d6b97cf081071ef2f8aea5af0a1acea80 (patch)
tree4c9cfaa7cfc3bce4afd198414fd8d18aef3881cc
parent895844c1acd42868e12caf34cdad180883f02b89 (diff)
parentee937815da8a62551a60a4e8a8def7dcbb76fa5f (diff)
downloadcar-5b66d77d6b97cf081071ef2f8aea5af0a1acea80.tar.gz
Merge "Add boilerplate for Railway reference app." into tm-dev
-rw-r--r--common/overlay/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml1
-rw-r--r--gsi_car_base.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/common/overlay/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml b/common/overlay/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
index dceae9a..5784afa 100644
--- a/common/overlay/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
@@ -30,6 +30,7 @@
<item>com.google.android.car.kitchensink</item>
<item>com.google.android.car.netdbug</item>
<item>com.google.android.car.networking.preferenceupdater</item>
+ <item>com.google.android.car.networking.railway</item>
<item>com.google.android.car.setupwizard</item>
<item>com.google.android.car.uxr.oas</item>
<item>com.google.android.car.uxr.sample</item>
diff --git a/gsi_car_base.mk b/gsi_car_base.mk
index 17b2535..6f76d44 100644
--- a/gsi_car_base.mk
+++ b/gsi_car_base.mk
@@ -86,6 +86,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/permissions/com.google.android.car.garagemode.testapp.xml \
system/etc/permissions/com.google.android.car.kitchensink.xml \
system/etc/permissions/com.google.android.car.networking.preferenceupdater.xml \
+ system/etc/permissions/com.google.android.car.networking.railway.xml \
system/etc/sysconfig/preinstalled-packages-product-car-base.xml \
system/etc/vintf/manifest/carpowerpolicyd.xml \
system/etc/vintf/manifest/carwatchdogd.xml \