Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05a6e2e8 authored by Cynthia Wasonga's avatar Cynthia Wasonga Committed by Android (Google) Code Review
Browse files

Merge "Prevent pre-installation of aosp system apps on clone profile"

parents e25a7597 3001ead9

target/product/generic_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    LiveWallpapersPicker \

    PartnerBookmarksProvider \

    preinstalled-packages-platform-generic-system.xml \

    Stk \

    Tag \

target/product/handheld_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ PRODUCT_PACKAGES += \ 
    MusicFX \

    NfcNci \

    PacProcessor \

    preinstalled-packages-platform-handheld-system.xml \

    PrintRecommendationService \

    PrintSpooler \

    ProxyHandler \

target/product/sysconfig/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -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",

}

target/product/sysconfig/preinstalled-packages-platform-aosp-product.xml

+8 −0
Original line number Diff line number Diff line
@@ -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>

target/product/sysconfig/preinstalled-packages-platform-generic-system.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?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>