preinstalled-packages-platform for profiles

Wallpaper packages are not needed on profiles.
This cl unwhitelists them, so that these system packages will
not be pre-installed on profile users.

Bug: 134605778
Test: Confirmed that the xml files appeared on device and that the
packages were not preinstalled
Change-Id: I39f877590f9853ae3b9c7271947947f0424da3ae
This commit is contained in:
Bookatz
2019-12-10 13:02:13 -08:00
parent 8204ab1397
commit 3c1f8dfd94
7 changed files with 106 additions and 1 deletions

View File

@@ -31,6 +31,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PACKAGES += \
messaging \
PhotoTable \
preinstalled-packages-platform-aosp-product.xml \
WAPPushManager \
WallpaperPicker \

View File

@@ -25,7 +25,8 @@ PRODUCT_PACKAGES := \
PRODUCT_PACKAGES += \
LiveWallpapersPicker \
PhotoTable
PhotoTable \
preinstalled-packages-platform-full-base.xml
# Bluetooth:
# audio.a2dp.default is a system module. Generic system image includes

View File

@@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \
Launcher3QuickStep \
Music \
OneTimeInitializer \
preinstalled-packages-platform-handheld-product.xml \
Provision \
QuickSearchBox \
Settings \

View File

@@ -0,0 +1,33 @@
// Copyright (C} 2019 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.
prebuilt_etc {
name: "preinstalled-packages-platform-aosp-product.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-aosp-product.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-full-base.xml",
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-full-base.xml",
}
prebuilt_etc {
name: "preinstalled-packages-platform-handheld-product.xml",
product_specific: true,
sub_dir: "sysconfig",
src: "preinstalled-packages-platform-handheld-product.xml",
}

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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 aosp_product, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<install-in-user-type package="com.android.wallpaperpicker">
<install-in user-type="FULL" />
</install-in-user-type>
</config>

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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 full_base, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<install-in-user-type package="com.android.wallpaper.livepicker">
<install-in user-type="FULL" />
</install-in-user-type>
</config>

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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_product, per user type.
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
-->
<config>
<install-in-user-type package="com.android.wallpapercropper">
<install-in user-type="FULL" />
</install-in-user-type>
</config>