diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:22:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:22:17 +0000 |
| commit | d54f2164a93b0ecc0ca34a41b4eb0ded533ecefa (patch) | |
| tree | 37ec1841816d15616272ab484bd8ad5801e7180c | |
| parent | 38bdf10877c4b91c913bdd3eeeb4fe46fb034693 (diff) | |
| parent | 5df12ea5fd4c1c05f51f00f58f88bdaeaac843da (diff) | |
| download | device_google_car-d54f2164a93b0ecc0ca34a41b4eb0ded533ecefa.tar.gz device_google_car-d54f2164a93b0ecc0ca34a41b4eb0ded533ecefa.tar.bz2 device_google_car-d54f2164a93b0ecc0ca34a41b4eb0ded533ecefa.zip | |
Merge "Tuned some car-specific settings on crosshatch_car:" into rvc-dev am: adb2e612dd am: 5df12ea5fd
Change-Id: I8fa9f93cfe794d5504d7e17cf7b1853db504e2d1
| -rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 7 | ||||
| -rw-r--r-- | crosshatch_car/overlay/packages/services/Car/service/res/values/config.xml | 26 |
2 files changed, 33 insertions, 0 deletions
diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk index 611f516..7d4abed 100644 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ b/crosshatch_car/aosp_crosshatch_car.mk @@ -60,6 +60,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.heapgrowthlimit=256m +PRODUCT_PACKAGE_OVERLAYS += device/google_car/crosshatch_car/overlay + +# Pre-create users +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ + android.car.number_pre_created_users=1 \ + android.car.number_pre_created_guests=1 + # Enable landscape PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml diff --git a/crosshatch_car/overlay/packages/services/Car/service/res/values/config.xml b/crosshatch_car/overlay/packages/services/Car/service/res/values/config.xml new file mode 100644 index 0000000..8116e7b --- /dev/null +++ b/crosshatch_car/overlay/packages/services/Car/service/res/values/config.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, 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. +*/ +--> + +<!-- Resources to configure car service based on each OEM's preference. --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Disable switching the user while the system is resuming from Suspend to RAM. + This default says to prevent changing the user during Resume. --> + <bool name="config_disableUserSwitchDuringResume" translatable="false">false</bool> +</resources> |