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

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

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

parents 7c2f719d 2f858356

AconfigFlags.bp

+0 −14
Original line number Original line Diff line number Diff line
@@ -910,8 +910,6 @@ java_aconfig_library { 
aconfig_declarations {

aconfig_declarations {

    name: "android.service.notification.flags-aconfig",

    name: "android.service.notification.flags-aconfig",

    package: "android.service.notification",

    package: "android.service.notification",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/notification/flags.aconfig"],

    srcs: ["core/java/android/service/notification/flags.aconfig"],

}

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

    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

// Smartspace

aconfig_declarations {

aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",

    name: "android.app.smartspace.flags-aconfig",

Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -508,6 +508,7 @@ java_library { 
    lint: {

    lint: {

        baseline_filename: "lint-baseline.xml",

        baseline_filename: "lint-baseline.xml",

    },

    },

    // For jarjar repackaging

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}

}

core/java/android/service/notification/flags.aconfig

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

package: "android.service.notification"

container: "system"





flag {

flag {

  name: "ranking_update_ashmem"

  name: "ranking_update_ashmem"
@@ -13,7 +12,6 @@ flag { 
  namespace: "systemui"

  namespace: "systemui"

  description: "This flag controls the redacting of sensitive notifications from untrusted NotificationListenerServices"

  description: "This flag controls the redacting of sensitive notifications from untrusted NotificationListenerServices"

  bug: "306271190"

  bug: "306271190"

  is_exported: true

}

}





flag {

flag {