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

Commit c176aaad authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26405624',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26405624', 'googleplex-android-review.googlesource.com/26663317'] into 24Q2-release.

Change-Id: Id43b14a6898e01083aeb6419a1fd8f1f4104564a
parents b4366b77 2050055d
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@ flag {
    bug: "307327678"
}

flag {
    name: "restrict_nonpreloads_system_shareduids"
    namespace: "package_manager_service"
    description: "Feature flag to restrict apps from joining system shared uids"
    bug: "308573169"
    is_fixed_read_only: true
}

flag {
    name: "min_target_sdk_24"
    namespace: "responsible_apis"
+6 −0
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ prebuilt_etc {
    src: "enhanced-confirmation.xml",
}

prebuilt_etc {
    name: "package-shareduid-allowlist.xml",
    sub_dir: "sysconfig",
    src: "package-shareduid-allowlist.xml",
}

// Privapp permission whitelist files

prebuilt_etc {
+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/sysconfig/package-shareduid-allowlist.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/sysconfig/package-shareduid-allowlist.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.carrierconfig.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.carrierconfig.xml)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.emergency.xml)
+35 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2024 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.
 -->

<!--
This XML defines an allowlist for packages that want to join a particular shared-uid.
If a non-system package that is signed with platform signature, is trying to join a particular
shared-uid, and not in this list, the installation will fail.

- The "package" XML attribute refers to the app's package name.
- The "shareduid" XML attribute refers to the shared uid name.

Example usage
    1. <allow-package-shareduid package="com.example.app" shareduid="android.uid.system"/>
        Indicates that a package - com.example.app, will be able to join android.uid.system.
    2. <allow-package-shareduid package="oem.example.app" shareduid="oem.uid.custom"/>
        Indicates that a package - oem.example.app, will be able to join oem.uid.custom.
-->

<config>
    <allow-package-shareduid package="android.test.settings" shareduid="android.uid.system" />
</config>
+4 −0
Original line number Diff line number Diff line
@@ -343,6 +343,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
        setPadding(getPaddingLeft(), getPaddingTop() + getResources().getDimensionPixelSize(
                        R.dimen.keyguard_security_container_padding_top), getPaddingRight(),
                getPaddingBottom());
        setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(),
                com.android.internal.R.attr.materialColorSurface));
    }

    void onResume(SecurityMode securityMode, boolean faceAuthEnabled) {
@@ -800,6 +802,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {

    void reloadColors() {
        mViewMode.reloadColors();
        setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(),
                com.android.internal.R.attr.materialColorSurface));
    }

    /** Handles density or font scale changes. */
Loading