commit 2870517c26af7f297d24d50946f577f7ae544892
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 07 12:55:58 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 07 12:55:58 2025 -0800
tree 037e515f9c7b0169f769c3af7e8ffe6565050045
parent 0d6e9f21249053273b4ee1c8990991a74278674e
parent a751c84ad936c24a6302f91519ab33b9a04d583c

Merge "backported_fixes_proto: specify sdk_version" into main

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

diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs
index 81340f2..d4025e6 100644
--- a/tools/aconfig/aconfig/src/codegen/java.rs
+++ b/tools/aconfig/aconfig/src/codegen/java.rs
@@ -547,7 +547,7 @@
         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 @@
                     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 @@
         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 @@
                 } 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

diff --git a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
index c390574..ac5270a 100644
--- a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
+++ b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
@@ -16,7 +16,7 @@
 /** @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 @@
         {{ -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.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 @@
         } 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());