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

Commit 43382525 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12"

parents a8ee80e9 47a40615

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ android_library { 
        "zxing-core-1.7",

        "android.hardware.dumpstate-V1.0-java",

        "android.hardware.dumpstate-V1.1-java",

        "lottie",

    ],



    libs: [
@@ -89,6 +90,7 @@ platform_compat_config { 


android_app {

    name: "Settings",

    defaults: ["platform_app_defaults"],

    platform_apis: true,

    certificate: "platform",

    system_ext_specific: true,

AndroidManifest.xml

+481 −98

File changed.

Preview size limit exceeded, changes collapsed.

OWNERS

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
android-settings-core-eng+gerrit@google.com



# People who can approve changes for submission

arcwang@google.com

chiujason@google.com

edgarwang@google.com

emilychuang@google.com
@@ -11,5 +12,8 @@ sunnyshao@google.com 
tmfang@google.com

yantingyang@google.com



# Emergency only

luyota@google.com



# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)

per-file *.xml=*

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p . 
strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}



checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



robolectric_hook = ${REPO_ROOT}/packages/apps/Settings/tests/robotests/new_tests_hook.sh ${REPO_PROJECT}

color-check-baseline.xml

+1996 −609

File changed.

Preview size limit exceeded, changes collapsed.