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

Commit 748efff8 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 

Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
parents e40251b9 733eed05

Android.bp

+29 −1
Original line number Diff line number Diff line
@@ -3,6 +3,21 @@ java_library { 
    srcs: ["src/**/*.logtags"],

}



genrule {

    name: "statslog-settings-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module settings"

        + " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog",

    out: ["com/android/settings/core/instrumentation/SettingsStatsLog.java"],

}



java_library {

    name: "statslog-settings",

    srcs: [

        ":statslog-settings-java-gen",

    ],

}



// Build the Settings APK

android_library {

    name: "Settings-core",
@@ -36,22 +51,35 @@ android_library { 
        "settings-log-bridge-protos-lite",

        "contextualcards",

        "settings-logtags",

        "statslog-settings",

        "zxing-core-1.7",

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

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

    ],



    libs: [

        "telephony-common",

        "ims-common",

        "app-compat-annotations",

    ],

}



platform_compat_config {

    name: "settings-platform-compat-config",

    src: ":Settings-core",

    system_ext_specific: true,

}



android_app {

    name: "Settings",

    platform_apis: true,

    certificate: "platform",

    system_ext_specific: true,

    privileged: true,

    required: ["privapp_whitelist_com.android.settings"],

    required: [

        "privapp_whitelist_com.android.settings",

        "settings-platform-compat-config",

    ],

    static_libs: ["Settings-core"],

    resource_dirs: [],

    optimize: {

AndroidManifest.xml

+359 −225

File changed.

Preview size limit exceeded, changes collapsed.

OWNERS

+6 −13
Original line number Diff line number Diff line 
# Use this reviewer by default.

pixel-sw-exp-reviews+gerrit@google.com

android-settings-core-eng+gerrit@google.com



# People who can approve changes for submission

asapperstein@google.com

asargent@google.com

dehboxturtle@google.com

dhnishi@google.com

chiujason@google.com

edgarwang@google.com

emilychuang@google.com

jackqdyulei@google.com

lindatseng@google.com

mfritze@google.com

rafftsai@google.com

millchen@google.com

stanleytfwang@google.com

sunnyshao@google.com

tmfang@google.com

zhfan@google.com



# Emergency approvers in case the above are not available

miket@google.com

yantingyang@google.com



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

per-file *.xml=*

color-check-baseline.xml

+397 −105

File changed.

Preview size limit exceeded, changes collapsed.

protos/contextual_card_list.proto

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ message ContextualCard { 
    POSSIBLE = 2;

    IMPORTANT = 3;

    DEFERRED_SETUP = 5;

    STICKY = 6;

  }



  /** Slice uri of the contextual card */