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

Commit d8887da8 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Implement user-type allowlist for Settings app on handhe..."" into main

parents 08839aae 563d8b4e

target/product/handheld_system_ext.mk

+0 −3
Original line number Diff line number Diff line
@@ -30,6 +30,3 @@ 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

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ 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

deleted100644 → 0
+0 −30
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>