release: Bump aconfig flags extension to AP4A

Change-Id: Ifc7fd31dc7a26bedd47a4e85a8c8cc5bd9c0d36a

release/aconfig/ap3a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "all_notifs_need_ttl"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap3a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_hide_unused_channels"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap3a/com.android.server.notification/reject_old_notifications_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "reject_old_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap3a/com.android.settings.flags/Android.bp

@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-ap3a-com.android.settings.flags-all",
-  package: "com.android.settings.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}

release/aconfig/ap3a/com.android.settings.flags/homepage_revamp_flag_values.textproto

@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "homepage_revamp"
-  state: ENABLED
-  permission: READ_WRITE
-}

release/aconfig/ap4a/Android.bp

@@ -14,9 +14,8 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-lineage-ap3a",
+    name: "aconfig_value_set-lineage-ap4a",
     values: [
-        "aconfig-values-ap3a-com.android.server.notification-all",
+        "aconfig-values-ap4a-com.android.server.notification-all",
-        "aconfig-values-ap3a-com.android.settings.flags-all",
     ],
 }

release/aconfig/ap4a/com.android.server.notification/Android.bp

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-ap3a-com.android.server.notification-all",
+  name: "aconfig-values-ap4a-com.android.server.notification-all",
   package: "com.android.server.notification",
   srcs: [
     "*_flag_values.textproto",

release/build_config/ap4a.scl

@@ -18,6 +18,6 @@ load("//build/make/core/release_config.scl", "value")
 
 values = [
     # keep-sorted start numeric=yes
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-lineage-ap3a"),
+    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-lineage-ap4a"),
     # keep-sorted end
 ]

release/build_config/ap4a.textproto

@@ -1,6 +1,6 @@
 values: [
     {
         name: "RELEASE_ACONFIG_VALUE_SETS"
-        value: "aconfig_value_set-lineage-ap3a"
+        value: "aconfig_value_set-lineage-ap4a"
     }
 ]

release/flag_declarations/RELEASE_KERNEL_CAIMAN_DIR.textproto

@@ -1,8 +0,0 @@
-name: "RELEASE_KERNEL_CAIMAN_DIR"
-namespace: "android_UNKNOWN"
-description: ""
-value: {
-  string_value: ""
-}
-workflow: PREBUILT
-containers: "vendor"

release/flag_declarations/RELEASE_KERNEL_COMET_DIR.textproto

@@ -1,8 +0,0 @@
-name: "RELEASE_KERNEL_COMET_DIR"
-namespace: "android_UNKNOWN"
-description: ""
-value: {
-  string_value: ""
-}
-workflow: PREBUILT
-containers: "vendor"

release/flag_declarations/RELEASE_KERNEL_KOMODO_DIR.textproto

@@ -1,8 +0,0 @@
-name: "RELEASE_KERNEL_KOMODO_DIR"
-namespace: "android_UNKNOWN"
-description: ""
-value: {
-  string_value: ""
-}
-workflow: PREBUILT
-containers: "vendor"

release/flag_declarations/RELEASE_KERNEL_TOKAY_DIR.textproto

@@ -1,8 +0,0 @@
-name: "RELEASE_KERNEL_TOKAY_DIR"
-namespace: "android_UNKNOWN"
-description: ""
-value: {
-  string_value: ""
-}
-workflow: PREBUILT
-containers: "vendor"

release/flag_values/ap3a/RELEASE_KERNEL_CAIMAN_DIR.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CAIMAN_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/24Q3-12386881"
-}

release/flag_values/ap3a/RELEASE_KERNEL_COMET_DIR.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_COMET_DIR"
-value: {
-  string_value: "device/google/comet-kernels/6.1/24Q3-12386881"
-}

release/flag_values/ap3a/RELEASE_KERNEL_KOMODO_DIR.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_KOMODO_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/24Q3-12386881"
-}

release/flag_values/ap3a/RELEASE_KERNEL_TOKAY_DIR.textproto

@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TOKAY_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/24Q3-12386881"
-}

release/flag_values/ap4a/RELEASE_SVN_AKITA.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_AKITA"
 value: {
-  string_value: "24"
+  string_value: "25"
 }

release/flag_values/ap4a/RELEASE_SVN_BLUEJAY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_BLUEJAY"
 value: {
-  string_value: "68"
+  string_value: "69"
 }

release/flag_values/ap4a/RELEASE_SVN_CAIMAN.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_CAIMAN"
 value: {
-  string_value: "08"
+  string_value: "09"
 }

release/flag_values/ap4a/RELEASE_SVN_CHEETAH.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_CHEETAH"
 value: {
-  string_value: "64"
+  string_value: "65"
 }

release/flag_values/ap4a/RELEASE_SVN_COMET.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_COMET"
 value: {
-  string_value: "08"
+  string_value: "09"
 }

release/flag_values/ap4a/RELEASE_SVN_FELIX.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_FELIX"
 value: {
-  string_value: "58"
+  string_value: "59"
 }

release/flag_values/ap4a/RELEASE_SVN_HUSKY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_HUSKY"
 value: {
-  string_value: "41"
+  string_value: "42"
 }

release/flag_values/ap4a/RELEASE_SVN_KOMODO.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_KOMODO"
 value: {
-  string_value: "08"
+  string_value: "09"
 }

release/flag_values/ap4a/RELEASE_SVN_LYNX.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_LYNX"
 value: {
-  string_value: "49"
+  string_value: "50"
 }

release/flag_values/ap4a/RELEASE_SVN_ORIOLE.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_ORIOLE"
 value: {
-  string_value: "89"
+  string_value: "90"
 }

release/flag_values/ap4a/RELEASE_SVN_PANTHER.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_PANTHER"
 value: {
-  string_value: "64"
+  string_value: "65"
 }

release/flag_values/ap4a/RELEASE_SVN_RAVEN.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_RAVEN"
 value: {
-  string_value: "89"
+  string_value: "90"
 }

release/flag_values/ap4a/RELEASE_SVN_SHIBA.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_SHIBA"
 value: {
-  string_value: "41"
+  string_value: "42"
 }

release/flag_values/ap4a/RELEASE_SVN_TOKAY.textproto

@@ -1,4 +1,4 @@
 name: "RELEASE_SVN_TOKAY"
 value: {
-  string_value: "08"
+  string_value: "10"
 }

release/release_config_map.mk

@@ -17,6 +17,6 @@
 local_dir := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # Attach the flag value definitions to the various release configurations.
-$(call declare-release-config, ap3a, $(local_dir)build_config/ap3a.scl)
+$(call declare-release-config, ap4a, $(local_dir)build_config/ap4a.scl)
 
 local_dir :=

release/release_config_map.textproto

@@ -4,11 +4,11 @@ default_containers: "system_ext"
 default_containers: "vendor"
 
 release_config {
-    name: "ap3a"
+    name: "ap4a"
-    flag_value_files: "release_configs/ap3a.textproto"
+    flag_value_files: "release_configs/ap4a.textproto"
 }
 
 build_config {
-    name: "ap3a"
+    name: "ap4a"
-    flag_value_files: "build_config/ap3a.textproto"
+    flag_value_files: "build_config/ap4a.textproto"
 }

release/release_configs/ap3a.textproto

@@ -1,3 +0,0 @@
-name: "ap3a"
-prior_stages: "trunk"
-aconfig_value_sets: "aconfig_value_set-lineage-ap3a"

release/release_configs/ap4a.textproto

@@ -0,0 +1,3 @@
+name: "ap4a"
+prior_stages: "trunk"
+aconfig_value_sets: "aconfig_value_set-lineage-ap4a"