Merge "Handle null exception messages in FeatureFlagsImpl.java.template" into main (a00b187f) · Commits · e / os / android_build

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

+15 −3

Original line number	Diff line number	Diff line
		@@ -547,14 +547,26 @@ mod tests {
		enabledRw = reader.getBooleanFlagValue("enabled_rw", true);
		disabledRwInOtherNamespace = reader.getBooleanFlagValue("disabled_rw_in_other_namespace", false);
		} else {
		Log.e(TAG, "encountered an AconfigStorageReadException");
		if (error.getMessage() != null) {
		Log.e(TAG, error.getMessage());
		} else {
		Log.e(TAG, "Encountered a null AconfigStorageReadException");
		}
		}
		} catch (Exception e) {
		if (e.getMessage() != null) {
		Log.e(TAG, e.getMessage());
		} else {
		Log.e(TAG, "Encountered a null Exception");
		}
		} catch (NoClassDefFoundError e) {
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		if (e.getMessage() != null) {
		Log.e(TAG, e.getMessage());
		} else {
		Log.e(TAG, "Encountered a null NoClassDefFoundError");
		}
		}
		isCached = true;
		}

+15 −3

Original line number	Diff line number	Diff line
		@@ -50,14 +50,26 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
		{{ -endfor }}
		{{ -endfor }}
		} else \{
		Log.e(TAG, "encountered an AconfigStorageReadException");
		if (error.getMessage() != null) \{
		Log.e(TAG, error.getMessage());
		} else \{
		Log.e(TAG, "Encountered a null AconfigStorageReadException");
		}
		}
		} catch (Exception e) \{
		if (e.getMessage() != null) \{
		Log.e(TAG, e.getMessage());
		} else \{
		Log.e(TAG, "Encountered a null Exception");
		}
		} catch (NoClassDefFoundError e) \{
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		if (e.getMessage() != null) \{
		Log.e(TAG, e.getMessage());
		} else \{
		Log.e(TAG, "Encountered a null NoClassDefFoundError");
		}
		}
		isCached = true;
		}