commit c8ae8f11ab345baae42288a725545d4d73af79b4
author Zhi Dou <zhidou@google.com> Wed Feb 21 21:52:40 2024 +0000
committer Zhi Dou <zhidou@google.com> Thu Feb 22 12:51:41 2024 +0000
tree 4368f5a227d29fa0fb2e7b0c793d497ded07aea9
parent 7b5f3f42fc682ead3aac9a314c7029e613ade135

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

This reverts commit 2f858356dd9688d83b3186a5a10fa67d6cb9e101.

Reason for revert: The original issue is fixed ag/26320339

Change-Id: I74bb8123fe90d82e3569a60fea44af13bcbd0f5f

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 14658e5..2047168 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -910,6 +910,8 @@
 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 @@
     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",

Android.bp

diff --git a/Android.bp b/Android.bp
index 870df5a..019bf6508 100644
--- a/Android.bp
+++ b/Android.bp
@@ -508,7 +508,6 @@
     lint: {
         baseline_filename: "lint-baseline.xml",
     },
-    // For jarjar repackaging
     jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",
 }
 

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

diff --git a/core/java/android/service/notification/flags.aconfig b/core/java/android/service/notification/flags.aconfig
index 446fe3d..c5acc2c 100644
--- a/core/java/android/service/notification/flags.aconfig
+++ b/core/java/android/service/notification/flags.aconfig
@@ -1,4 +1,5 @@
 package: "android.service.notification"
+container: "system"
 
 flag {
   name: "ranking_update_ashmem"
@@ -12,6 +13,7 @@
   namespace: "systemui"
   description: "This flag controls the redacting of sensitive notifications from untrusted NotificationListenerServices"
   bug: "306271190"
+  is_exported: true
 }
 
 flag {