Revert^2 "Cache Java codegen'd flags in static member variables."
This reverts commit efda207c09
.
Reason for revert: this unrevert contains the fix for b/311187402
Test: cargo test
Change-Id: I210aebd30edd864a7c141ede336c12aebf4f1fcd
This commit is contained in:
@@ -104,6 +104,12 @@ lazy_static::lazy_static! {
|
||||
"com.android.aconfig.test.disabled_rw",
|
||||
"false") == "true";
|
||||
|
||||
/// flag value cache for disabled_rw_2
|
||||
static ref CACHED_disabled_rw_2: bool = flags_rust::GetServerConfigurableFlag(
|
||||
"aconfig_flags.other_namespace",
|
||||
"com.android.aconfig.test.disabled_rw_2",
|
||||
"false") == "true";
|
||||
|
||||
/// flag value cache for enabled_rw
|
||||
static ref CACHED_enabled_rw: bool = flags_rust::GetServerConfigurableFlag(
|
||||
"aconfig_flags.aconfig_test",
|
||||
@@ -122,6 +128,11 @@ impl FlagProvider {
|
||||
*CACHED_disabled_rw
|
||||
}
|
||||
|
||||
/// query flag disabled_rw_2
|
||||
pub fn disabled_rw_2(&self) -> bool {
|
||||
*CACHED_disabled_rw_2
|
||||
}
|
||||
|
||||
/// query flag enabled_fixed_ro
|
||||
pub fn enabled_fixed_ro(&self) -> bool {
|
||||
true
|
||||
@@ -153,6 +164,12 @@ pub fn disabled_rw() -> bool {
|
||||
PROVIDER.disabled_rw()
|
||||
}
|
||||
|
||||
/// query flag disabled_rw_2
|
||||
#[inline(always)]
|
||||
pub fn disabled_rw_2() -> bool {
|
||||
PROVIDER.disabled_rw_2()
|
||||
}
|
||||
|
||||
/// query flag enabled_fixed_ro
|
||||
#[inline(always)]
|
||||
pub fn enabled_fixed_ro() -> bool {
|
||||
@@ -211,6 +228,21 @@ impl FlagProvider {
|
||||
self.overrides.insert("disabled_rw", val);
|
||||
}
|
||||
|
||||
/// query flag disabled_rw_2
|
||||
pub fn disabled_rw_2(&self) -> bool {
|
||||
self.overrides.get("disabled_rw_2").copied().unwrap_or(
|
||||
flags_rust::GetServerConfigurableFlag(
|
||||
"aconfig_flags.other_namespace",
|
||||
"com.android.aconfig.test.disabled_rw_2",
|
||||
"false") == "true"
|
||||
)
|
||||
}
|
||||
|
||||
/// set flag disabled_rw_2
|
||||
pub fn set_disabled_rw_2(&mut self, val: bool) {
|
||||
self.overrides.insert("disabled_rw_2", val);
|
||||
}
|
||||
|
||||
/// query flag enabled_fixed_ro
|
||||
pub fn enabled_fixed_ro(&self) -> bool {
|
||||
self.overrides.get("enabled_fixed_ro").copied().unwrap_or(
|
||||
@@ -285,6 +317,18 @@ pub fn set_disabled_rw(val: bool) {
|
||||
PROVIDER.lock().unwrap().set_disabled_rw(val);
|
||||
}
|
||||
|
||||
/// query flag disabled_rw_2
|
||||
#[inline(always)]
|
||||
pub fn disabled_rw_2() -> bool {
|
||||
PROVIDER.lock().unwrap().disabled_rw_2()
|
||||
}
|
||||
|
||||
/// set flag disabled_rw_2
|
||||
#[inline(always)]
|
||||
pub fn set_disabled_rw_2(val: bool) {
|
||||
PROVIDER.lock().unwrap().set_disabled_rw_2(val);
|
||||
}
|
||||
|
||||
/// query flag enabled_fixed_ro
|
||||
#[inline(always)]
|
||||
pub fn enabled_fixed_ro() -> bool {
|
||||
|
Reference in New Issue
Block a user