Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0b10e8d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "java FlagImpl: Clear context without instrumentat" into main am: da5bff1c 

Original change: https://android-review.googlesource.com/c/platform/build/+/3339565



Change-Id: Ie23d1dc2131f4fa7ce2b9bc1af0f3840cf44aa50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bffb509 da5bff1c

tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
{{ -endif }}



{{ -if runtime_lookup_required }}

import android.os.Binder;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig.Properties;

{{ -endif }}
@@ -142,6 +143,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
{{ -endfor }}

{{ for namespace_with_flags in namespace_flags }}

    private void load_overrides_{namespace_with_flags.namespace}() \{

        final long ident = Binder.clearCallingIdentity();

        try \{

            Properties properties = DeviceConfig.getProperties("{namespace_with_flags.namespace}");

{{ -for flag in namespace_with_flags.flags }}
@@ -159,6 +161,8 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
                + "flag declaration.",

                e

            );

        } finally \{

            Binder.restoreCallingIdentity(ident);

        }

        {namespace_with_flags.namespace}_is_cached = true;

}