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

Commit 761bbe3c authored by Jared Duke's avatar Jared Duke Committed by Automerger Merge Worker
Browse files

Merge "Ensure inner classes of @SystemApi classes are kept" into main am: 663e2aaa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817021



Change-Id: I5f190e3c41530ec792bfc65c92d4623f21c5a05b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6637e0b1 663e2aaa

services/proguard.flags

+8 −1
Original line number Diff line number Diff line
@@ -14,13 +14,20 @@ 
}



# APIs referenced by dependent JAR files and modules

-keep @interface android.annotation.SystemApi

# TODO(b/300514883): Pull @SystemApi keep rules from system-api.pro.

-keep interface android.annotation.SystemApi

-keep @android.annotation.SystemApi class * {

  public protected *;

}

-keepclasseswithmembers class * {

  @android.annotation.SystemApi *;

}

# Also ensure nested classes are kept. This is overly conservative, but handles

# cases where such classes aren't explicitly marked @SystemApi.

-if @android.annotation.SystemApi class *

-keep public class <1>$** {

  public protected *;

}



# Derivatives of SystemService and other services created via reflection

-keep,allowoptimization,allowaccessmodification class * extends com.android.server.SystemService {