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

Commit 3da1c926 authored by Zhi Dou's avatar Zhi Dou Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Create exported mode library for package android.service.notification"" into main

parents e1161ab7 c8ae8f11
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -910,6 +910,8 @@ java_aconfig_library {
aconfig_declarations {
    name: "android.service.notification.flags-aconfig",
    package: "android.service.notification",
    exportable: true,
    container: "system",
    srcs: ["core/java/android/service/notification/flags.aconfig"],
}

@@ -919,6 +921,18 @@ java_aconfig_library {
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

java_aconfig_library {
    name: "android.service.notification.flags-aconfig-export-java",
    aconfig_declarations: "android.service.notification.flags-aconfig",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
    mode: "exported",
    min_sdk_version: "30",
    apex_available: [
        "//apex_available:platform",
        "com.android.extservices",
    ],
}

// Smartspace
aconfig_declarations {
    name: "android.app.smartspace.flags-aconfig",
+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ java_library {
    lint: {
        baseline_filename: "lint-baseline.xml",
    },
    // For jarjar repackaging
    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",
}

+2 −0
Original line number Diff line number Diff line
package: "android.service.notification"
container: "system"

flag {
  name: "ranking_update_ashmem"
@@ -12,6 +13,7 @@ flag {
  namespace: "systemui"
  description: "This flag controls the redacting of sensitive notifications from untrusted NotificationListenerServices"
  bug: "306271190"
  is_exported: true
}

flag {