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

Merge "only use new storage for read write" into main am: 088443385f

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

Change-Id: I25fc5c20a4e3fab97db3c68f7ca06d9903762434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-19 21:55:27 +00:00
committed by Automerger Merge Worker
parent 02e0fd0dd8 088443385f
commit 687e1fcf6e
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,7 +677,7 @@ mod tests {
modified_parsed_flags.into_iter(),
mode,
flag_ids,
false,
true,
)
.unwrap();
@@ -870,7 +870,7 @@ mod tests {
modified_parsed_flags.into_iter(),
mode,
flag_ids,
false,
true,
)
.unwrap();
@@ -991,7 +991,7 @@ mod tests {
modified_parsed_flags.into_iter(),
mode,
flag_ids,
false,
true,
)
.unwrap();
let expect_featureflags_content = r#"

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

@@ -10,12 +10,14 @@ import android.provider.DeviceConfig;
import android.provider.DeviceConfig.Properties;
{{ -if not library_exported }}
{{ -if allow_instrumentation }}
import android.aconfig.storage.StorageInternalReader;
import android.util.Log;
import java.io.File;
{{ -endif }}
{{ -endif }}
{{ -endif }}
/** @hide */
@@ -30,6 +32,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
private static boolean {flag.method_name} = {flag.default_value};
{{ -endif }}
{{ -endfor }}
{{ -if not library_exported }}
{{ -if allow_instrumentation }}
StorageInternalReader reader;
boolean readFromNewStorage;
@@ -40,23 +43,31 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
File file = new File("/metadata/aconfig_test_missions/mission_1");
if (file.exists()) \{
readFromNewStorage = true;
reader = new StorageInternalReader("{container}", "{package_name}");
try \{
reader = new StorageInternalReader("{container}", "{package_name}");
} catch(Exception e) \{
reader = null;
}
}
}
{{ -endif }}
{{ -endif }}
{{ for namespace_with_flags in namespace_flags }}
private void load_overrides_{namespace_with_flags.namespace}() \{
try \{
{{ -if not library_exported }}
{{ -if allow_instrumentation }}
boolean val;
{{ -endif }}
{{ -endif }}
Properties properties = DeviceConfig.getProperties("{namespace_with_flags.namespace}");
{{ -for flag in namespace_with_flags.flags }}
{{ -if flag.is_read_write }}
{flag.method_name} =
properties.getBoolean(Flags.FLAG_{flag.flag_name_constant_suffix}, {flag.default_value});
{{ -if not library_exported }}
{{ -if allow_instrumentation }}
if (readFromNewStorage) \{
if (readFromNewStorage && reader != null) \{
try \{
val = reader.getBooleanFlagValue({flag.flag_offset});
if (val == {flag.method_name}) \{
@@ -67,11 +78,12 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
val, {flag.method_name}));
}
} catch (Exception e) \{
Log.e(TAG,"error: failed to read flag value of {flag.method_name}");
Log.e(TAG,"error: failed to read flag value of {flag.method_name}", e);
}
}
{{ -endif }}
{{ -endif }}
{{ -endif }}
{{ -endfor }}
} catch (NullPointerException e) \{
throw new RuntimeException(