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

Commit 126e91d5 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix bugs in ravenhelper-PTA" into main

parents d9391997 5894956a
Loading
Loading
Loading
Loading
+95 −1
Original line number Diff line number Diff line
@@ -1353,6 +1353,94 @@ SourceFile: "TinyFrameworkExceptionTester.java"
RuntimeInvisibleAnnotations:
  x: #x()
    android.hosttest.annotation.HostSideTestWholeClassKeep
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 2, attributes: 3
Constant pool:
{
  public com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2(com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1);
    descriptor: (Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=2, args_size=2
         x: aload_0
         x: invokespecial #x                  // Method java/lang/Object."<init>":()V
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2;
            0       5     1 this$1   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;
    MethodParameters:
      Name                           Flags
      <no name>                      final mandated

  public void baz();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=0, locals=1, args_size=1
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2;
}
SourceFile: "TinyFrameworkForPta.java"
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
InnerClasses:
  public #x= #x of #x;                 // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 2, attributes: 3
Constant pool:
{
  public com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1(com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta);
    descriptor: (Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=2, args_size=2
         x: aload_0
         x: invokespecial #x                  // Method java/lang/Object."<init>":()V
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;
            0       5     1 this$0   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta;
    MethodParameters:
      Name                           Flags
      <no name>                      final mandated

  public void bar();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=0, locals=1, args_size=1
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;
}
SourceFile: "TinyFrameworkForPta.java"
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
@@ -1361,7 +1449,7 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 3, attributes: 1
  interfaces: 0, fields: 0, methods: 3, attributes: 3
Constant pool:
{
  public com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta();
@@ -1399,6 +1487,12 @@ Constant pool:
      LineNumberTable:
}
SourceFile: "TinyFrameworkForPta.java"
NestMembers:
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                 // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForTextPolicy.class
  Compiled from "TinyFrameworkForTextPolicy.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForTextPolicy
+81 −1
Original line number Diff line number Diff line
@@ -1565,6 +1565,80 @@ RuntimeVisibleAnnotations:
    )
  x: #x()
    android.hosttest.annotation.HostSideTestWholeClassKeep
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 1, attributes: 4
Constant pool:
{
  public void baz();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=0, locals=1, args_size=1
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2;
    RuntimeVisibleAnnotations:
      x: #x(#x=s#x)
        com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
          reason="file-override"
        )
}
InnerClasses:
  public #x= #x of #x;                 // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 1, attributes: 4
Constant pool:
{
  public void bar();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=0, locals=1, args_size=1
         x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
            0       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;
    RuntimeVisibleAnnotations:
      x: #x(#x=s#x)
        com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
          reason="file-override"
        )
}
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
@@ -1573,7 +1647,7 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 3, attributes: 2
  interfaces: 0, fields: 0, methods: 3, attributes: 4
Constant pool:
{
  public com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta();
@@ -1625,12 +1699,18 @@ Constant pool:
          reason="file-override (Keep static initializer)"
        )
}
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                 // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestMembers:
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForTextPolicy.class
  Compiled from "TinyFrameworkForTextPolicy.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForTextPolicy
+111 −1
Original line number Diff line number Diff line
@@ -1822,6 +1822,110 @@ RuntimeVisibleAnnotations:
    )
  x: #x()
    android.hosttest.annotation.HostSideTestWholeClassKeep
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 2, attributes: 4
Constant pool:
{
  private static {};
    descriptor: ()V
    flags: (0x000a) ACC_PRIVATE, ACC_STATIC
    Code:
      stack=2, locals=0, args_size=0
         x: ldc           #x                  // class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
         x: ldc           #x                 // String com.android.hoststubgen.hosthelper.HostTestUtils.logClassLoaded
         x: invokestatic  #x                 // Method com/android/hoststubgen/hosthelper/HostTestUtils.onClassLoaded:(Ljava/lang/Class;Ljava/lang/String;)V
         x: return

  public void baz();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=4, locals=1, args_size=1
         x: ldc           #x                  // class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
         x: ldc           #x                 // String baz
         x: ldc           #x                 // String ()V
         x: ldc           #x                 // String com.android.hoststubgen.hosthelper.HostTestUtils.logMethodCall
         x: invokestatic  #x                 // Method com/android/hoststubgen/hosthelper/HostTestUtils.callMethodCallHook:(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
        x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
           11       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2;
    RuntimeVisibleAnnotations:
      x: #x(#x=s#x)
        com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
          reason="file-override"
        )
}
InnerClasses:
  public #x= #x of #x;                 // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
  minor version: 0
  major version: 65
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 2, attributes: 4
Constant pool:
{
  private static {};
    descriptor: ()V
    flags: (0x000a) ACC_PRIVATE, ACC_STATIC
    Code:
      stack=2, locals=0, args_size=0
         x: ldc           #x                  // class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
         x: ldc           #x                 // String com.android.hoststubgen.hosthelper.HostTestUtils.logClassLoaded
         x: invokestatic  #x                 // Method com/android/hoststubgen/hosthelper/HostTestUtils.onClassLoaded:(Ljava/lang/Class;Ljava/lang/String;)V
         x: return

  public void bar();
    descriptor: ()V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=4, locals=1, args_size=1
         x: ldc           #x                  // class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
         x: ldc           #x                 // String bar
         x: ldc           #x                 // String ()V
         x: ldc           #x                 // String com.android.hoststubgen.hosthelper.HostTestUtils.logMethodCall
         x: invokestatic  #x                 // Method com/android/hoststubgen/hosthelper/HostTestUtils.callMethodCallHook:(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
        x: return
      LineNumberTable:
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
           11       1     0  this   Lcom/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1;
    RuntimeVisibleAnnotations:
      x: #x(#x=s#x)
        com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
          reason="file-override"
        )
}
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                  // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestHost: class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta.class
  Compiled from "TinyFrameworkForPta.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
@@ -1830,7 +1934,7 @@ public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta
  flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: #x                          // com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  super_class: #x                         // java/lang/Object
  interfaces: 0, fields: 0, methods: 3, attributes: 2
  interfaces: 0, fields: 0, methods: 3, attributes: 4
Constant pool:
{
  public com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta();
@@ -1900,12 +2004,18 @@ Constant pool:
          reason="file-override (Keep static initializer)"
        )
}
InnerClasses:
  public #x= #x of #x;                  // Nest1=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta
  public #x= #x of #x;                 // Nest2=class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2 of class com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
SourceFile: "TinyFrameworkForPta.java"
RuntimeVisibleAnnotations:
  x: #x(#x=s#x)
    com.android.hoststubgen.hosthelper.HostStubGenProcessedAsKeep(
      reason="file-override"
    )
NestMembers:
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1
  com/android/hoststubgen/test/tinyframework/TinyFrameworkForPta$Nest1$Nest2
## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkForTextPolicy.class
  Compiled from "TinyFrameworkForTextPolicy.java"
public class com.android.hoststubgen.test.tinyframework.TinyFrameworkForTextPolicy
+22 −0
Original line number Diff line number Diff line
@@ -372,6 +372,28 @@ com.android.hoststubgen.test.tinyframework
  file-override (keep multi-arg method)
  0
  2
com.android.hoststubgen.test.tinyframework
  TinyFrameworkForPta$Nest1
  0
  com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
  bar
  bar()V
  1
  Keep
  file-override
  0
  2
com.android.hoststubgen.test.tinyframework
  TinyFrameworkForPta$Nest1$Nest2
  0
  com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
  baz
  baz()V
  1
  Keep
  file-override
  0
  2
com.android.hoststubgen.test.tinyframework
  TinyFrameworkForTextPolicy
  0
+36 −0
Original line number Diff line number Diff line
@@ -36,6 +36,22 @@ apply "tiny-framework/src/com/android/hoststubgen/test/tinyframework/TinyFramewo
# add annotation to method com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta.foo(Ljava/lang/String;Ljava/lang/Object;)V
25i\
    @android.ravenwood.annotation.RavenwoodKeep

# add class annotation to com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
28i\
    @android.ravenwood.annotation.RavenwoodKeepPartialClass

# add annotation to method com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1.bar*
29i\
        @android.ravenwood.annotation.RavenwoodKeep

# add class annotation to com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
32i\
        @android.ravenwood.annotation.RavenwoodKeepPartialClass

# add annotation to method com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2.baz*
33i\
            @android.ravenwood.annotation.RavenwoodKeep
__END_OF_SCRIPT__

#==============================================================================
@@ -249,6 +265,14 @@ apply "annotation-allowed-classes-tiny-framework-for-pta-test.txt" <<'__END_OF_S
$a\
com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta

# add to annotation allowlist
$a\
com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1

# add to annotation allowlist
$a\
com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2

# add to annotation allowlist
$a\
com.android.hoststubgen.test.tinyframework.TinyFrameworkForTextPolicy
@@ -414,6 +438,18 @@ apply "policy-override-tiny-framework.txt" <<'__END_OF_SCRIPT__'

# remove method policy com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta.foo(Ljava/lang/String;Ljava/lang/Object;)V
94s/^/#[PTA]: /

# remove class policy on com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1
96s/^/#[PTA]: /

# remove method policy com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1.bar*
97s/^/#[PTA]: /

# remove class policy on com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2
99s/^/#[PTA]: /

# remove method policy com.android.hoststubgen.test.tinyframework.TinyFrameworkForPta$Nest1$Nest2.baz*
100s/^/#[PTA]: /
__END_OF_SCRIPT__

echo "All files updated successfully!"
Loading