suppress JDK 21 'this-escape' warning am: 100544f1dc am: 90ddc5733c am: 2b6f80612a

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/2886453

Change-Id: I1744c04083b87bc771785773cd0f6b76de4179f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

45 files changed, 65 insertions, 0 deletions

diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index d81693bd..0c3ca385 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -285,6 +285,7 @@ void StubClass::MakeConstructors(const AidlInterface* interfaceType) {
     code << "public Stub(android.os.PermissionEnforcer enforcer)\n";
   } else {
     code << "/** Construct the stub at attach it to the interface. */\n";
+    code << "@SuppressWarnings(\"this-escape\")\n";
     code << "public Stub()\n";
   }
   code << "{\n";
diff --git a/tests/golden_output/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java b/tests/golden_output/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
index 85958896..35f0555d 100644
--- a/tests/golden_output/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
+++ b/tests/golden_output/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
@@ -51,6 +51,7 @@ public interface ICppJavaTests extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ICppJavaTests
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
index 385f6362..a00cb657 100644
--- a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
+++ b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
@@ -29,6 +29,7 @@ public interface IFaz extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.generic.IFaz
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
index 4765d1b5..72411e4b 100644
--- a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
+++ b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
@@ -21,6 +21,7 @@ public interface IBaz extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.immutable.IBaz
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
index 82595062..d8ee7bca 100644
--- a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
+++ b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
@@ -17,6 +17,7 @@ public interface IEmpty extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.map.IEmpty
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
index b095cb9f..373a6950 100644
--- a/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
+++ b/tests/golden_output/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
@@ -49,6 +49,7 @@ public interface IMapTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.map.IMapTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java b/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
index 39a84467..db586d1e 100644
--- a/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
+++ b/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
@@ -399,6 +399,7 @@ public class FixedSizeArrayExample implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.fixedsizearray.FixedSizeArrayExample.IRepeatFixedSizeArray
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -816,6 +817,7 @@ public class FixedSizeArrayExample implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.fixedsizearray.FixedSizeArrayExample.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
index 208c442d..978fe3c9 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
@@ -58,6 +58,7 @@ public class ArrayOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ArrayOfInterfaces.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -155,6 +156,7 @@ public class ArrayOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ArrayOfInterfaces.IMyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
index 3336de16..9500795f 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
@@ -21,6 +21,7 @@ public interface ICircular extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ICircular
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
index 1291f2a3..5a0b6d2c 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
@@ -19,6 +19,7 @@ public interface IDeprecated extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.IDeprecated
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
index a0af481f..70e8eaf0 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
@@ -21,6 +21,7 @@ public interface INamedCallback extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.INamedCallback
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
index 71788707..d0b1736a 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
@@ -21,6 +21,7 @@ public interface INewName extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.INewName
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
index 3b9e54e6..5f770b4f 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
@@ -21,6 +21,7 @@ public interface IOldName extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.IOldName
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
index 97304080..4011316e 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
@@ -631,6 +631,7 @@ public interface ITestService extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -4061,6 +4062,7 @@ public interface ITestService extends android.os.IInterface
       public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.Foo
       {
         /** Construct the stub at attach it to the interface. */
+        @SuppressWarnings("this-escape")
         public Stub()
         {
           this.attachInterface(this, DESCRIPTOR);
@@ -4345,6 +4347,7 @@ public interface ITestService extends android.os.IInterface
       public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.NoPrefixInterface
       {
         /** Construct the stub at attach it to the interface. */
+        @SuppressWarnings("this-escape")
         public Stub()
         {
           this.attachInterface(this, DESCRIPTOR);
@@ -4512,6 +4515,7 @@ public interface ITestService extends android.os.IInterface
         public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.NoPrefixInterface.NestedNoPrefixInterface
         {
           /** Construct the stub at attach it to the interface. */
+          @SuppressWarnings("this-escape")
           public Stub()
           {
             this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
index e3d663f2..5f679f51 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
@@ -58,6 +58,7 @@ public class ListOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ListOfInterfaces.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -155,6 +156,7 @@ public class ListOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ListOfInterfaces.IMyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
index 0254abf1..546c5f0f 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
@@ -24,6 +24,7 @@ public interface INestedService extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.nested.INestedService
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -236,6 +237,7 @@ public interface INestedService extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.nested.INestedService.ICallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java b/tests/golden_output/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
index 924c06af..886745b5 100644
--- a/tests/golden_output/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
+++ b/tests/golden_output/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
@@ -20,6 +20,7 @@ public interface INoPermission extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.permission.INoPermission
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index f69d99df..89406500 100644
--- a/tests/golden_output/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -48,6 +48,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index 92ad1b6c..b0d38b62 100644
--- a/tests/golden_output/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -51,6 +51,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index ba14c2ec..15e270a7 100644
--- a/tests/golden_output/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -88,6 +88,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java b/tests/golden_output/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
index f1f89c37..1b806748 100644
--- a/tests/golden_output/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
+++ b/tests/golden_output/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
@@ -21,6 +21,7 @@ public interface ILoggableInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.loggable.ILoggableInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -238,6 +239,7 @@ public interface ILoggableInterface extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.loggable.ILoggableInterface.ISub
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java b/tests/golden_output/frozen/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
index 85958896..35f0555d 100644
--- a/tests/golden_output/frozen/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
+++ b/tests/golden_output/frozen/aidl-cpp-java-test-interface-java-source/gen/android/aidl/tests/ICppJavaTests.java
@@ -51,6 +51,7 @@ public interface ICppJavaTests extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ICppJavaTests
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
index 385f6362..a00cb657 100644
--- a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
+++ b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/generic/IFaz.java
@@ -29,6 +29,7 @@ public interface IFaz extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.generic.IFaz
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
index 4765d1b5..72411e4b 100644
--- a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
+++ b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/immutable/IBaz.java
@@ -21,6 +21,7 @@ public interface IBaz extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.immutable.IBaz
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
index 82595062..d8ee7bca 100644
--- a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
+++ b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IEmpty.java
@@ -17,6 +17,7 @@ public interface IEmpty extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.map.IEmpty
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
index b095cb9f..373a6950 100644
--- a/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
+++ b/tests/golden_output/frozen/aidl-test-extras-java-source/gen/android/aidl/tests/map/IMapTest.java
@@ -49,6 +49,7 @@ public interface IMapTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.map.IMapTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java b/tests/golden_output/frozen/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
index 39a84467..db586d1e 100644
--- a/tests/golden_output/frozen/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
+++ b/tests/golden_output/frozen/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
@@ -399,6 +399,7 @@ public class FixedSizeArrayExample implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.fixedsizearray.FixedSizeArrayExample.IRepeatFixedSizeArray
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -816,6 +817,7 @@ public class FixedSizeArrayExample implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.fixedsizearray.FixedSizeArrayExample.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
index 208c442d..978fe3c9 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
@@ -58,6 +58,7 @@ public class ArrayOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ArrayOfInterfaces.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -155,6 +156,7 @@ public class ArrayOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ArrayOfInterfaces.IMyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
index 3336de16..9500795f 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ICircular.java
@@ -21,6 +21,7 @@ public interface ICircular extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ICircular
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
index 1291f2a3..5a0b6d2c 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IDeprecated.java
@@ -19,6 +19,7 @@ public interface IDeprecated extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.IDeprecated
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
index a0af481f..70e8eaf0 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INamedCallback.java
@@ -21,6 +21,7 @@ public interface INamedCallback extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.INamedCallback
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
index 71788707..d0b1736a 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/INewName.java
@@ -21,6 +21,7 @@ public interface INewName extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.INewName
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
index 3b9e54e6..5f770b4f 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/IOldName.java
@@ -21,6 +21,7 @@ public interface IOldName extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.IOldName
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
index 97304080..4011316e 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ITestService.java
@@ -631,6 +631,7 @@ public interface ITestService extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -4061,6 +4062,7 @@ public interface ITestService extends android.os.IInterface
       public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.Foo
       {
         /** Construct the stub at attach it to the interface. */
+        @SuppressWarnings("this-escape")
         public Stub()
         {
           this.attachInterface(this, DESCRIPTOR);
@@ -4345,6 +4347,7 @@ public interface ITestService extends android.os.IInterface
       public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.NoPrefixInterface
       {
         /** Construct the stub at attach it to the interface. */
+        @SuppressWarnings("this-escape")
         public Stub()
         {
           this.attachInterface(this, DESCRIPTOR);
@@ -4512,6 +4515,7 @@ public interface ITestService extends android.os.IInterface
         public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ITestService.CompilerChecks.NoPrefixInterface.NestedNoPrefixInterface
         {
           /** Construct the stub at attach it to the interface. */
+          @SuppressWarnings("this-escape")
           public Stub()
           {
             this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
index e3d663f2..5f679f51 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
@@ -58,6 +58,7 @@ public class ListOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ListOfInterfaces.IEmptyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
@@ -155,6 +156,7 @@ public class ListOfInterfaces implements android.os.Parcelable
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.ListOfInterfaces.IMyInterface
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
index 0254abf1..546c5f0f 100644
--- a/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
+++ b/tests/golden_output/frozen/aidl-test-interface-java-source/gen/android/aidl/tests/nested/INestedService.java
@@ -24,6 +24,7 @@ public interface INestedService extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.nested.INestedService
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -236,6 +237,7 @@ public interface INestedService extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.tests.nested.INestedService.ICallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java b/tests/golden_output/frozen/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
index 924c06af..886745b5 100644
--- a/tests/golden_output/frozen/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
+++ b/tests/golden_output/frozen/aidl-test-interface-permission-java-source/gen/android/aidl/tests/permission/INoPermission.java
@@ -20,6 +20,7 @@ public interface INoPermission extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.tests.permission.INoPermission
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/frozen/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index f69d99df..89406500 100644
--- a/tests/golden_output/frozen/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V1-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -48,6 +48,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/frozen/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index 92ad1b6c..b0d38b62 100644
--- a/tests/golden_output/frozen/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V2-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -51,6 +51,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java b/tests/golden_output/frozen/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
index ba14c2ec..15e270a7 100644
--- a/tests/golden_output/frozen/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
+++ b/tests/golden_output/frozen/aidl-test-versioned-interface-V3-java-source/gen/android/aidl/versioned/tests/IFooInterface.java
@@ -88,6 +88,7 @@ public interface IFooInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.versioned.tests.IFooInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java b/tests/golden_output/frozen/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
index f1f89c37..1b806748 100644
--- a/tests/golden_output/frozen/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
+++ b/tests/golden_output/frozen/aidl_test_loggable_interface-java-source/gen/android/aidl/loggable/ILoggableInterface.java
@@ -21,6 +21,7 @@ public interface ILoggableInterface extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.loggable.ILoggableInterface
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -238,6 +239,7 @@ public interface ILoggableInterface extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.loggable.ILoggableInterface.ISub
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
index 9cf19d0b..88153277 100644
--- a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
+++ b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
@@ -48,6 +48,7 @@ public interface ITrunkStableTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -559,6 +560,7 @@ public interface ITrunkStableTest extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest.IMyCallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
index 2c7a6732..40ec579f 100644
--- a/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
+++ b/tests/golden_output/frozen/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
@@ -52,6 +52,7 @@ public interface ITrunkStableTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -651,6 +652,7 @@ public interface ITrunkStableTest extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest.IMyCallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
index 9cf19d0b..88153277 100644
--- a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
+++ b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V1-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
@@ -48,6 +48,7 @@ public interface ITrunkStableTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -559,6 +560,7 @@ public interface ITrunkStableTest extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest.IMyCallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);
diff --git a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
index 8fe47bb7..9b321aac 100644
--- a/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
+++ b/tests/golden_output/tests/trunk_stable_test/android.aidl.test.trunk-V2-java-source/gen/android/aidl/test/trunk/ITrunkStableTest.java
@@ -52,6 +52,7 @@ public interface ITrunkStableTest extends android.os.IInterface
   public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest
   {
     /** Construct the stub at attach it to the interface. */
+    @SuppressWarnings("this-escape")
     public Stub()
     {
       this.attachInterface(this, DESCRIPTOR);
@@ -639,6 +640,7 @@ public interface ITrunkStableTest extends android.os.IInterface
     public static abstract class Stub extends android.os.Binder implements android.aidl.test.trunk.ITrunkStableTest.IMyCallback
     {
       /** Construct the stub at attach it to the interface. */
+      @SuppressWarnings("this-escape")
       public Stub()
       {
         this.attachInterface(this, DESCRIPTOR);