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

Commit cf862d01 authored by Nikhil Kumar's avatar Nikhil Kumar
Browse files

Implement user-type allowlist for Settings app on handheld_system_ext allowlist XML. 

Two major changes in this refactoring are
- Removing the pre installation of settings app from the non FULL SYSTEM user
- Refactoring the broader PROFILE type to granular PROFILE types where the settings package is needed.

Bug: 413301513
Test: build and install the image to verify Settings app installed or not on different types of user
Flag: EXEMPT only affecting non-released HSUM devices.
Change-Id: I8cf0152d6faaf260539583a908b4b23a54b50e39
parent f4358382

target/product/handheld_system_ext.mk

+3 −0
Original line number Diff line number Diff line
@@ -30,3 +30,6 @@ PRODUCT_PACKAGES += \ 
    StorageManager \

    SystemUI \

    WallpaperCropper \



# Allowlist for system packages included in handheld_system_ext.mk

PRODUCT_PACKAGES += preinstalled_packages_handheld_system_ext.xml

target/product/sysconfig/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ prebuilt_etc { 
    src: "preinstalled-packages-platform-telephony-product.xml",

}



prebuilt_etc {

    name: "preinstalled_packages_handheld_system_ext.xml",

    sub_dir: "sysconfig",

    system_ext_specific: true,

    src: "preinstalled_packages_handheld_system_ext.xml",

}



prebuilt_etc {

    name: "initial-package-stopped-states-aosp.xml",

    product_specific: true,

target/product/sysconfig/preinstalled_packages_handheld_system_ext.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2025 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.

-->

<!-- Allowlist for system packages included in handheld_system_ext.mk -->

<config>

    <!--  Settings (Settings app) -->

    <!--  Do not install the Settings app for non-FULL SYSTEM user -->

    <!--  @TODO To revisit it again and see if this package still needs to

        be installed on all the PROFILE user types listed,

        b/408457689 - Only changing broader PROFILE to granual PROFILE types.

    -->

    <install-in-user-type package="com.android.settings">

        <install-in user-type="FULL" />

        <install-in user-type="android.os.usertype.profile.CLONE" />

        <install-in user-type="android.os.usertype.profile.MANAGED" />

        <install-in user-type="android.os.usertype.profile.PRIVATE" />

    </install-in-user-type>

</config>