Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c82db1a2 authored Nov 26, 2024 by Treehugger Robot Committed by Automerger Merge Worker Nov 26, 2024

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

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

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

parents c2c21ebf 87e988fd

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ mod tests {
		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

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
		{{ -endfor }}
		{{ -endfor }}
		} else \{
		Log.e(TAG, error.getMessage());
		Log.e(TAG, "encountered an AconfigStorageReadException");
		}
		} catch (Exception e) \{
		Log.e(TAG, e.getMessage());