commit 96fc9862835546c33aaea4d40a978f64be98e023
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 26 02:57:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 26 02:57:01 2024 +0000
tree 9719d03e1a076d805c775076702e2f9427e5e4bd
parent 868ce1cf135ed11cdb0a9796189d9579f8b0ed98
parent c82db1a23838ceddc6c2c59e6a6c9267cadcc565

Merge "codegen: don't log AconfigStorageReadException" into main am: 87e988fdad am: c82db1a238

Original change: https://android-review.googlesource.com/c/platform/build/+/3377069

Change-Id: Ifed2089c40fb55cd63a9b23831ec5c319d24e6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/aconfig/aconfig/src/codegen/java.rs

diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs
index 5c56ca6..71f743b 100644
--- a/tools/aconfig/aconfig/src/codegen/java.rs
+++ b/tools/aconfig/aconfig/src/codegen/java.rs
@@ -547,7 +547,7 @@
                         enabledRw = reader.getBooleanFlagValue("enabled_rw", true);
                         disabledRwInOtherNamespace = reader.getBooleanFlagValue("disabled_rw_in_other_namespace", false);
                     } else {
-                        Log.e(TAG, error.getMessage());
+                        Log.e(TAG, "encountered an AconfigStorageReadException");
                     }
                 } catch (Exception e) {
                     Log.e(TAG, e.getMessage());

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 c94bf33..b482123 100644
--- a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
+++ b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
@@ -50,7 +50,7 @@
             {{ -endfor }}
             {{ -endfor }}
             } else \{
-                Log.e(TAG, error.getMessage());
+                Log.e(TAG, "encountered an AconfigStorageReadException");
             }
         } catch (Exception e) \{
             Log.e(TAG, e.getMessage());