commit 69cf455b9edcfcafee664628892abb45ac5a9ad9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:03 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:03 2023 +0000
tree c3cc153b0be9c5d44b4fdf780b3dfc9246a5c0e4
parent c47bddb47a0e63b74fdba3ae2b7870bfa959bc5f
parent 609ea65c971f6e5c10e47a1b6fb48dcec2436941

Snap for 10453563 from 609ea65c971f6e5c10e47a1b6fb48dcec2436941 to mainline-ipsec-release

Change-Id: I5ab09ddc4b54b55be4e542a8a7c37505dee64b40

Android.bp

diff --git a/Android.bp b/Android.bp
index bc1b1a9..8047a81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -102,6 +102,18 @@
         "guice",
     ],
     libs: ["junit"],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ComparableType:WARN",
+            "-Xep:NonRuntimeAnnotation:WARN",
+            "-Xep:GetClassOnAnnotation:WARN",
+            "-Xep:RandomModInteger:WARN",
+            "-Xep:FormatString:WARN",
+            "-Xep:DoubleBraceInitialization:WARN",
+            "-Xep:UnusedCollectionModifiedInPlace:WARN",
+        ],
+    },
 }
 
 // TODO: also add the tests once we have testng working.

src/main/java/org/testng/internal/ClonedMethod.java

diff --git a/src/main/java/org/testng/internal/ClonedMethod.java b/src/main/java/org/testng/internal/ClonedMethod.java
index 1a8ff08..7544506 100755
--- a/src/main/java/org/testng/internal/ClonedMethod.java
+++ b/src/main/java/org/testng/internal/ClonedMethod.java
@@ -146,7 +146,7 @@
 
   @Override
   public Class getRealClass() {
-    return m_javaMethod.getClass();
+    return m_javaMethod.getDeclaringClass();
   }
 
   @Override