commit c27a993249bbd3f1d752c9099b3636527a98b1ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jan 01 23:21:29 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 01 23:21:29 2025 -0800
tree 345e720426f0e8c44b632975988d44fd16c4e492
parent c0bc89f35b87b1c6e3fc1d072256c9e89e4dbd8e
parent 20a5697f0f1b71f9634174b753f45a95707f6c8c

Merge "Remove dangling -- after parsing arguments" into main

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 7407d7f..314816d 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -642,6 +642,7 @@
         default: [],
     }) + select(product_variable("debuggable"), {
         true: [
+            "alloctop",
             "adevice_fingerprint",
             "arping",
             "avbctl",

tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template

diff --git a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
index 8b3d3e1..c390574 100644
--- a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
+++ b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
@@ -73,7 +73,7 @@
     private static final String TAG = "{package_name}.FeatureFlagsImpl_exported";
     private static volatile boolean isCached = false;
 {{ for flag in flag_elements }}
-    private static boolean {flag.method_name} = {flag.default_value};
+    private static boolean {flag.method_name} = false;
 {{ -endfor }}
     private void init() \{
         try \{