Merge "Shorten TAG in generated code and catch LinkageError" into main (0d6e9f21) · Commits · e / os / android_build

tools/aconfig/aconfig/src/codegen/java.rs

+4 −4

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ mod tests {
		import android.util.Log;
		/** @hide */
		public final class FeatureFlagsImpl implements FeatureFlags {
		private static final String TAG = "com.android.aconfig.test.FeatureFlagsImpl";
		private static final String TAG = "FeatureFlagsImpl";
		private static volatile boolean isCached = false;
		private static boolean disabledRw = false;
		private static boolean disabledRwExported = false;
		@@ -562,7 +562,7 @@ mod tests {
		disabledRwInOtherNamespace = reader.getBooleanFlagValue(2);
		} catch (Exception e) {
		Log.e(TAG, e.toString());
		} catch (NoClassDefFoundError e) {
		} catch (LinkageError e) {
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		Log.e(TAG, e.toString());
		@@ -929,7 +929,7 @@ mod tests {
		import android.util.Log;
		/** @hide */
		public final class FeatureFlagsImpl implements FeatureFlags {
		private static final String TAG = "com.android.aconfig.test.FeatureFlagsImpl_exported";
		private static final String TAG = "FeatureFlagsImplExport";
		private static volatile boolean isCached = false;
		private static boolean disabledRwExported = false;
		private static boolean enabledFixedRoExported = false;
		@@ -943,7 +943,7 @@ mod tests {
		} catch (Exception e) {
		// pass
		Log.e(TAG, e.toString());
		} catch (NoClassDefFoundError e) {
		} catch (LinkageError e) {
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		Log.e(TAG, e.toString());

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ import android.util.Log;
		/** @hide */
		public final class FeatureFlagsImpl implements FeatureFlags \{
		{{ -if runtime_lookup_required }}
		private static final String TAG = "{package_name}.FeatureFlagsImpl";
		private static final String TAG = "FeatureFlagsImpl";
		private static volatile boolean isCached = false;
		{{ for flag in flag_elements }}
		{{ -if flag.is_read_write }}
		@@ -40,7 +40,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
		{{ -endfor }}
		} catch (Exception e) \{
		Log.e(TAG, e.toString());
		} catch (NoClassDefFoundError e) \{
		} catch (LinkageError e) \{
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		Log.e(TAG, e.toString());
		@@ -70,7 +70,7 @@ import android.os.flagging.AconfigPackage;
		import android.util.Log;
		/** @hide */
		public final class FeatureFlagsImpl implements FeatureFlags \{
		private static final String TAG = "{package_name}.FeatureFlagsImpl_exported";
		private static final String TAG = "FeatureFlagsImplExport";
		private static volatile boolean isCached = false;
		{{ for flag in flag_elements }}
		private static boolean {flag.method_name} = false;
		@@ -86,7 +86,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
		} catch (Exception e) \{
		// pass
		Log.e(TAG, e.toString());
		} catch (NoClassDefFoundError e) \{
		} catch (LinkageError e) \{
		// for mainline module running on older devices.
		// This should be replaces to version check, after the version bump.
		Log.e(TAG, e.toString());