StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aconfig: Don't log matching validated flags" into main am: 1c0e255327

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3262192

Change-Id: If21fbc5179ee88905b78c106542a1d35a0cece97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-12 16:49:20 +00:00
committed by Automerger Merge Worker
parent 9188de2042 1c0e255327
commit 8c56d035d1
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/aconfig/aconfig/src/codegen/java.rs
View File

@@ -745,10 +745,8 @@ mod tests {
boolean val; boolean val;
try { try {
val = reader.getBooleanFlagValue(1); val = reader.getBooleanFlagValue(1);
if (val == disabledRw) { if (val != disabledRw) {
Log.i(TAG, String.format(SUCCESS_LOG, "disabledRw")); Log.w(TAG, String.format(MISMATCH_LOG, "disabledRw", val, disabledRw));
} else {
Log.i(TAG, String.format(MISMATCH_LOG, "disabledRw", val, disabledRw));
} }
if (useNewStorageValueAndDiscardOld) { if (useNewStorageValueAndDiscardOld) {
@@ -756,10 +754,8 @@ mod tests {
} }
val = reader.getBooleanFlagValue(2); val = reader.getBooleanFlagValue(2);
if (val == disabledRwExported) { if (val != disabledRwExported) {
Log.i(TAG, String.format(SUCCESS_LOG, "disabledRwExported")); Log.w(TAG, String.format(MISMATCH_LOG, "disabledRwExported", val, disabledRwExported));
} else {
Log.i(TAG, String.format(MISMATCH_LOG, "disabledRwExported", val, disabledRwExported));
} }
if (useNewStorageValueAndDiscardOld) { if (useNewStorageValueAndDiscardOld) {
@@ -767,10 +763,8 @@ mod tests {
} }
val = reader.getBooleanFlagValue(8); val = reader.getBooleanFlagValue(8);
if (val == enabledRw) { if (val != enabledRw) {
Log.i(TAG, String.format(SUCCESS_LOG, "enabledRw")); Log.w(TAG, String.format(MISMATCH_LOG, "enabledRw", val, enabledRw));
} else {
Log.i(TAG, String.format(MISMATCH_LOG, "enabledRw", val, enabledRw));
} }
if (useNewStorageValueAndDiscardOld) { if (useNewStorageValueAndDiscardOld) {
@@ -804,10 +798,8 @@ mod tests {
boolean val; boolean val;
try { try {
val = reader.getBooleanFlagValue(3); val = reader.getBooleanFlagValue(3);
if (val == disabledRwInOtherNamespace) { if (val != disabledRwInOtherNamespace) {
Log.i(TAG, String.format(SUCCESS_LOG, "disabledRwInOtherNamespace")); Log.w(TAG, String.format(MISMATCH_LOG, "disabledRwInOtherNamespace", val, disabledRwInOtherNamespace));
} else {
Log.i(TAG, String.format(MISMATCH_LOG, "disabledRwInOtherNamespace", val, disabledRwInOtherNamespace));
} }
if (useNewStorageValueAndDiscardOld) { if (useNewStorageValueAndDiscardOld) {

6
tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
View File

@@ -90,10 +90,8 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ -if flag.is_read_write }} {{ -if flag.is_read_write }}
val = reader.getBooleanFlagValue({flag.flag_offset}); val = reader.getBooleanFlagValue({flag.flag_offset});
if (val == {flag.method_name}) \{ if (val != {flag.method_name}) \{
Log.i(TAG, String.format(SUCCESS_LOG, "{flag.method_name}")); Log.w(TAG, String.format(MISMATCH_LOG, "{flag.method_name}", val, {flag.method_name}));
} else \{
Log.i(TAG, String.format(MISMATCH_LOG, "{flag.method_name}", val, {flag.method_name}));
} }
if (useNewStorageValueAndDiscardOld) \{ if (useNewStorageValueAndDiscardOld) \{

4
tools/aconfig/fake_device_config/src/android/util/Log.java
View File

@@ -5,6 +5,10 @@ public final class Log {
return 0; return 0;
} }
public static int w(String tag, String msg) {
return 0;
}
public static int e(String tag, String msg) { public static int e(String tag, String msg) {
return 0; return 0;
} }