StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent pre-installation of aosp system apps on clone profile

Browse Source 
Apps and their corresponding config files linked here: go/clone-configs-and-mks

Bug: 238970256
Test: Confirmed that the apps don't get pre-installed on the clone profile

Change-Id: I72beb9fd2ea5bcd5f1bf382a44a14812ef92c07d
This commit is contained in:
Cynthia Wasonga
2022-11-10 23:39:47 +00:00
parent 572b5b3bfa
commit 3001ead929
9 changed files with 149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/generic_system.mk
View File

@@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
LiveWallpapersPicker \
PartnerBookmarksProvider \
preinstalled-packages-platform-generic-system.xml \
Stk \
Tag \

1
target/product/handheld_system.mk
View File

@@ -57,6 +57,7 @@ PRODUCT_PACKAGES += \
MusicFX \
NfcNci \
PacProcessor \
preinstalled-packages-platform-handheld-system.xml \
PrintRecommendationService \
PrintSpooler \
ProxyHandler \

20
target/product/sysconfig/Android.bp
View File

@@ -29,9 +29,29 @@ prebuilt_etc {
src: "preinstalled-packages-platform-full-base.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-generic-system.xml",
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-generic-system.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-handheld-product.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-handheld-product.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-handheld-system.xml",
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-handheld-system.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-telephony-product.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-telephony-product.xml",
}

8
target/product/sysconfig/preinstalled-packages-platform-aosp-product.xml
View File

@@ -20,4 +20,12 @@
<install-in-user-type package="com.android.wallpaperpicker">
<install-in user-type="FULL" />
</install-in-user-type>
<!-- System packages that should not be pre-installed on the CLONE profile. -->
<!-- Messages -->
<install-in-user-type package="com.android.messaging">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

29
target/product/sysconfig/preinstalled-packages-platform-generic-system.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<!-- System packages to preinstall on all devices with generic_system, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Stk (SIM ToolKit)
TODO(b/258055479): Check if this should be preinstalled on SYSTEM user -->
<install-in-user-type package="com.android.stk">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

34
target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
View File

@@ -20,4 +20,38 @@
<install-in-user-type package="com.android.wallpapercropper">
<install-in user-type="FULL" />
</install-in-user-type>
<!-- Calendar -->
<install-in-user-type package="com.android.calendar">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Camera -->
<install-in-user-type package="com.android.camera2">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Clock -->
<install-in-user-type package="com.android.deskclock">
<install-in user-type="FULL" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Contacts -->
<install-in-user-type package="com.android.contacts">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
<!-- Gallery -->
<install-in-user-type package="com.android.gallery3d">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

26
target/product/sysconfig/preinstalled-packages-platform-handheld-system.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<!-- System packages to preinstall on all devices with handheld_system, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Printer (Does not show on launcher, but shows on the share sheet) -->
<install-in-user-type package="com.android.bips">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

29
target/product/sysconfig/preinstalled-packages-platform-telephony-product.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<!-- System packages to preinstall on all devices with telephony_product, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<!-- Phone
TODO(b/258055373): Check if this should be preinstalled on SYSTEM user -->
<install-in-user-type package="com.android.dialer">
<install-in user-type="SYSTEM" />
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
</install-in-user-type>
</config>

1
target/product/telephony_product.mk
View File

@@ -21,3 +21,4 @@
PRODUCT_PACKAGES += \
Dialer \
ImsServiceEntitlement \
preinstalled-packages-platform-telephony-product.xml