diff options
| author | Felipe Leme <felipeal@google.com> | 2020-03-23 17:44:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-23 17:44:22 +0000 |
| commit | b26213a3beb4851360b5a874966a9c66d0c5338a (patch) | |
| tree | fe2386e06e7868f284a340385ecc09d02edf9f61 | |
| parent | 9f8155a96386e750229c80b10b47df2838180efa (diff) | |
| parent | 144479556530954e02af8a66180a18037ff92a7f (diff) | |
| download | device_google_car-b26213a3beb4851360b5a874966a9c66d0c5338a.tar.gz device_google_car-b26213a3beb4851360b5a874966a9c66d0c5338a.tar.bz2 device_google_car-b26213a3beb4851360b5a874966a9c66d0c5338a.zip | |
Merge "Tuned some car-specific settings on flame_car:" into rvc-dev am: 1444795565
Change-Id: If41f5d32086371728a954b13e249fc61fd408702
| -rw-r--r-- | flame_car/aosp_flame_car.mk | 2 | ||||
| -rw-r--r-- | flame_car/overlay/packages/services/Car/service/res/values/config.xml | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/flame_car/aosp_flame_car.mk b/flame_car/aosp_flame_car.mk index 46d1252..96859ae 100644 --- a/flame_car/aosp_flame_car.mk +++ b/flame_car/aosp_flame_car.mk @@ -60,7 +60,7 @@ PRODUCT_PACKAGE_OVERLAYS += device/google_car/flame_car/overlay # Pre-create users PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ android.car.number_pre_created_users=1 \ - android.car.number_pre_created_guests=1 + android.car.number_pre_created_guests=2 # Enable landscape PRODUCT_COPY_FILES += \ diff --git a/flame_car/overlay/packages/services/Car/service/res/values/config.xml b/flame_car/overlay/packages/services/Car/service/res/values/config.xml new file mode 100644 index 0000000..8116e7b --- /dev/null +++ b/flame_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> |