Merge "Read from new storage in Java codegen" into main (70270692) · Commits · e / os / android_build

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -745,18 +745,33 @@ mod tests {
		} else {
		Log.i(TAG, String.format(MISMATCH_LOG, "disabledRw", val, disabledRw));
		}

		if (DeviceConfig.getBoolean("core_experiments_team_internal", "com.android.providers.settings.use_new_storage_value", false)) {
		disabledRw = val;
		}

		val = reader.getBooleanFlagValue(2);
		if (val == disabledRwExported) {
		Log.i(TAG, String.format(SUCCESS_LOG, "disabledRwExported"));
		} else {
		Log.i(TAG, String.format(MISMATCH_LOG, "disabledRwExported", val, disabledRwExported));
		}

		if (DeviceConfig.getBoolean("core_experiments_team_internal", "com.android.providers.settings.use_new_storage_value", false)) {
		disabledRwExported = val;
		}

		val = reader.getBooleanFlagValue(8);
		if (val == enabledRw) {
		Log.i(TAG, String.format(SUCCESS_LOG, "enabledRw"));
		} else {
		Log.i(TAG, String.format(MISMATCH_LOG, "enabledRw", val, enabledRw));
		}

		if (DeviceConfig.getBoolean("core_experiments_team_internal", "com.android.providers.settings.use_new_storage_value", false)) {
		enabledRw = val;
		}

		} catch (Exception e) {
		Log.e(TAG, ERROR_LOG, e);
		}
		@@ -789,6 +804,11 @@ mod tests {
		} else {
		Log.i(TAG, String.format(MISMATCH_LOG, "disabledRwInOtherNamespace", val, disabledRwInOtherNamespace));
		}

		if (DeviceConfig.getBoolean("core_experiments_team_internal", "com.android.providers.settings.use_new_storage_value", false)) {
		disabledRwInOtherNamespace = val;
		}

		} catch (Exception e) {
		Log.e(TAG, ERROR_LOG, e);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,11 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
		} else \{
		Log.i(TAG, String.format(MISMATCH_LOG, "{flag.method_name}", val, {flag.method_name}));
		}

		if (DeviceConfig.getBoolean("core_experiments_team_internal", "com.android.providers.settings.use_new_storage_value", false)) \{
		{flag.method_name} = val;
		}

		{{ -endif }}
		{{ -endfor }}
		} catch (Exception e) \{