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

Merge "Read from new storage in Java codegen" into main am: 70270692d0

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

Change-Id: Ibb96980bf396884677adf013319637ec7ac079b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-06 21:21:16 +00:00
committed by Automerger Merge Worker
parent 3a716b42b1 70270692d0
commit 480893a301
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
View File

@@ -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) \{