diff options
| author | Isaac Chen <ycchen@google.com> | 2020-04-07 11:30:32 +0800 |
|---|---|---|
| committer | Isaac Chen <ycchen@google.com> | 2020-04-08 12:45:28 +0800 |
| commit | d27f9dd2f8c15e89c3add585b5141d0df027c9ba (patch) | |
| tree | b0022721ac1c44fca58a5bfc1f37a4fad9724086 /mgsi | |
| parent | b0679e11a1e176322e861b6c123e1f914a08a579 (diff) | |
| download | common-d27f9dd2f8c15e89c3add585b5141d0df027c9ba.tar.gz | |
CSI to use framework's fallback home activity
CSI currently uses Shell's null home activity, which is not
recognized by Settings and listed for user to select in:
Settings > Apps & notifications > Default apps > Home app
while it is not supposed to be used by normal users.
This change lets CSI use the framework's fallback home, which
is enabled when ro.system_user_home_needed is true.
Bug: 149307007
Bug: 149780604
Test: $ lunch csi_x86-userdebug; m
$ lunch csi_arm64-userdebug; m
# flash the system.img built to crosshatch
$ atest DeviceHealthTests
Change-Id: I87ee8e4b8238b348145ad507e0ef347198f56eab
Diffstat (limited to 'mgsi')
| -rw-r--r-- | mgsi/csi_arm64.mk | 4 | ||||
| -rw-r--r-- | mgsi/csi_x86.mk | 4 | ||||
| -rw-r--r-- | mgsi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml | 23 |
3 files changed, 31 insertions, 0 deletions
diff --git a/mgsi/csi_arm64.mk b/mgsi/csi_arm64.mk index 142a8ec..ac0cb12 100644 --- a/mgsi/csi_arm64.mk +++ b/mgsi/csi_arm64.mk @@ -44,6 +44,10 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) # Don't build super.img. PRODUCT_BUILD_SUPER_PARTITION := false +# Instruct AM to enable framework's fallback home activity +PRODUCT_SYSTEM_EXT_PROPERTIES += ro.system_user_home_needed=true +# Add RRO needed by CSI +PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay PRODUCT_NAME := csi_arm64 PRODUCT_DEVICE := dummy_arm64 diff --git a/mgsi/csi_x86.mk b/mgsi/csi_x86.mk index 07cc5bd..070f4dd 100644 --- a/mgsi/csi_x86.mk +++ b/mgsi/csi_x86.mk @@ -43,6 +43,10 @@ $(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) # Don't build super.img. PRODUCT_BUILD_SUPER_PARTITION := false +# Instruct AM to enable framework's fallback home activity +PRODUCT_SYSTEM_EXT_PROPERTIES += ro.system_user_home_needed=true +# Add RRO needed by CSI +PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay PRODUCT_NAME := csi_x86 PRODUCT_DEVICE := dummy_x86 diff --git a/mgsi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/mgsi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml new file mode 100644 index 0000000..188916d --- /dev/null +++ b/mgsi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 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> + <!-- Skip setup so Home softkey could work. --> + <bool name="def_user_setup_complete">true</bool> +</resources> |