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

Commit 833fa691 authored by Sorin Basca's avatar Sorin Basca
Browse files

Update the golden image after building with JDK 21 

This was generated by running:

m droid && $ANDROID_BUILD_TOP/frameworks/base/tools/hoststubgen/hoststubgen/test-tiny-framework/diff-and-update-golden.sh -u

Bug: 313924276
Fixes: 328674570
Test: TH
Merged-In: Ia238ca246c4607984beaaa229ec21f2181f6f6a8
Change-Id: Ia238ca246c4607984beaaa229ec21f2181f6f6a8
parent 2381575a

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/01-hoststubgen-test-tiny-framework-orig-dump.txt

+25 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
      LocalVariableTable:

        Start  Length  Slot  Name   Signature

            0      10     0  name   Ljava/lang/String;

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumComplex(java.lang.String, java.lang.String);

    descriptor: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
@@ -1074,6 +1077,12 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
            0      18     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumComplex;

            0      18     3 longName   Ljava/lang/String;

            0      18     4 shortName   Ljava/lang/String;

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

      <no name>

      <no name>

    Signature: #x                          // (Ljava/lang/String;Ljava/lang/String;)V

    RuntimeInvisibleAnnotations:

      x: #x()
@@ -1224,6 +1233,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
      LocalVariableTable:

        Start  Length  Slot  Name   Signature

            0      10     0  name   Ljava/lang/String;

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple();

    descriptor: (Ljava/lang/String;I)V
@@ -1239,6 +1251,10 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
      LocalVariableTable:

        Start  Length  Slot  Name   Signature

            0       7     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumSimple;

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

    Signature: #x                          // ()V



  private static com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple[] $values();
@@ -2031,6 +2047,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$1 ex 
        Start  Length  Slot  Name   Signature

            0      10     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$1;

            0      10     1 this$0   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses;

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -2147,6 +2166,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$3 ex 
        Start  Length  Slot  Name   Signature

            0      10     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$3;

            0      10     1 this$0   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses;

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -2304,6 +2326,9 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClass 
        Start  Length  Slot  Name   Signature

            0      15     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$InnerClass;

            0      15     1 this$0   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses;

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated

}

SourceFile: "TinyFrameworkNestedClasses.java"

RuntimeInvisibleAnnotations:

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/02-hoststubgen-test-tiny-framework-host-stub-dump.txt

+19 −0
Original line number Diff line number Diff line
@@ -795,6 +795,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumComplex(java.lang.String, java.lang.String);

    descriptor: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
@@ -815,6 +818,12 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
    RuntimeInvisibleAnnotations:

      x: #x()

        android.hosttest.annotation.HostSideTestStub

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

      <no name>

      <no name>



  public java.lang.String getLongName();

    descriptor: ()Ljava/lang/String;
@@ -969,6 +978,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple();

    descriptor: (Ljava/lang/String;I)V
@@ -986,6 +998,10 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic



  private static com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple[] $values();

    descriptor: ()[Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumSimple;
@@ -1769,6 +1785,9 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClass 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated

}

InnerClasses:

  public #x= #x of #x;                   // InnerClass=class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$InnerClass of class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/03-hoststubgen-test-tiny-framework-host-impl-dump.txt

+25 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumComplex(java.lang.String, java.lang.String);

    descriptor: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
@@ -1257,6 +1260,12 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
    RuntimeInvisibleAnnotations:

      x: #x()

        android.hosttest.annotation.HostSideTestStub

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

      <no name>

      <no name>



  public java.lang.String getLongName();

    descriptor: ()Ljava/lang/String;
@@ -1453,6 +1462,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple();

    descriptor: (Ljava/lang/String;I)V
@@ -1474,6 +1486,10 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic



  private static com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple[] $values();

    descriptor: ()[Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumSimple;
@@ -2578,6 +2594,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$1 ex 
    RuntimeVisibleAnnotations:

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -2745,6 +2764,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$3 ex 
    RuntimeVisibleAnnotations:

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -2977,6 +2999,9 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClass 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated

}

InnerClasses:

  public #x= #x of #x;                   // InnerClass=class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$InnerClass of class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/12-hoststubgen-test-tiny-framework-host-ext-stub-dump.txt

+19 −0
Original line number Diff line number Diff line
@@ -795,6 +795,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumComplex(java.lang.String, java.lang.String);

    descriptor: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
@@ -815,6 +818,12 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
    RuntimeInvisibleAnnotations:

      x: #x()

        android.hosttest.annotation.HostSideTestStub

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

      <no name>

      <no name>



  public java.lang.String getLongName();

    descriptor: ()Ljava/lang/String;
@@ -969,6 +978,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple();

    descriptor: (Ljava/lang/String;I)V
@@ -986,6 +998,10 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic



  private static com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple[] $values();

    descriptor: ()[Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumSimple;
@@ -1769,6 +1785,9 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClass 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated

}

InnerClasses:

  public #x= #x of #x;                   // InnerClass=class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$InnerClass of class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/13-hoststubgen-test-tiny-framework-host-ext-impl-dump.txt

+25 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumComplex(java.lang.String, java.lang.String);

    descriptor: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
@@ -1569,6 +1572,12 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumC 
    RuntimeInvisibleAnnotations:

      x: #x()

        android.hosttest.annotation.HostSideTestStub

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic

      <no name>

      <no name>



  public java.lang.String getLongName();

    descriptor: ()Ljava/lang/String;
@@ -1798,6 +1807,9 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      mandated



  private com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple();

    descriptor: (Ljava/lang/String;I)V
@@ -1824,6 +1836,10 @@ public final class com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumS 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      synthetic

      <no name>                      synthetic



  private static com.android.hoststubgen.test.tinyframework.TinyFrameworkEnumSimple[] $values();

    descriptor: ()[Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkEnumSimple;
@@ -3190,6 +3206,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$1 ex 
    RuntimeVisibleAnnotations:

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -3407,6 +3426,9 @@ class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClasses$3 ex 
    RuntimeVisibleAnnotations:

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated



  public java.lang.Integer get();

    descriptor: ()Ljava/lang/Integer;
@@ -3704,6 +3726,9 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkNestedClass 
        com.android.hoststubgen.hosthelper.HostStubGenKeptInStub

      x: #x()

        com.android.hoststubgen.hosthelper.HostStubGenKeptInImpl

    MethodParameters:

      Name                           Flags

      <no name>                      final mandated

}

InnerClasses:

  public #x= #x of #x;                  // InnerClass=class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses$InnerClass of class com/android/hoststubgen/test/tinyframework/TinyFrameworkNestedClasses