commit 87e988fdad08c0634c3fa1b9f07c54e0765c3dd1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 26 02:44:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 26 02:44:27 2024 +0000
tree d6389779fa77ae40fbb710071ac50163dffbb151
parent fe48f574ea09dba52a0fca684d1ed7d62a79a936
parent 0622cc1224c4de1929b617ae00d0f67242d788df

Merge "codegen: don't log AconfigStorageReadException" into main

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());