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

Commit f89d10cf authored by Christoffer Adamsen's avatar Christoffer Adamsen Committed by Automerger Merge Worker
Browse files

Merge "Explicitly keep default constructor in rules without members" into main am: 97cb91ed 

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



Change-Id: I905010b25e369a7a117ae282535e27a6c3dce91f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a219876 97cb91ed

packages/SystemUI/plugin_core/proguard.flags

+4 −1
Original line number Diff line number Diff line
@@ -8,4 +8,7 @@ 
-keep interface com.android.systemui.plugins.annotations.** {

    *;

}

-keep,allowshrinking,allowoptimization,allowobfuscation,allowaccessmodification @com.android.systemui.plugins.annotations.** class *
 
# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep,allowshrinking,allowoptimization,allowobfuscation,allowaccessmodification @com.android.systemui.plugins.annotations.** class * {

    void <init>();

}

packages/SystemUI/proguard_common.flags

+16 −4
Original line number Diff line number Diff line
@@ -12,8 +12,14 @@ 
# Note that we restrict this to SysUISingleton classes, as other registering

# classes should either *always* unregister or *never* register from their

# constructor. We also keep callback class names for easier debugging.

-keepnames @com.android.systemui.util.annotations.WeaklyReferencedCallback class *

-keepnames class * extends @com.android.systemui.util.annotations.WeaklyReferencedCallback **

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keepnames @com.android.systemui.util.annotations.WeaklyReferencedCallback class * {

  void <init>();

}

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keepnames class * extends @com.android.systemui.util.annotations.WeaklyReferencedCallback ** {

  void <init>();

}

-if @com.android.systemui.util.annotations.WeaklyReferencedCallback class *

-keepclassmembers,allowaccessmodification @com.android.systemui.dagger.SysUISingleton class * {

  <1> *;
@@ -23,10 +29,16 @@ 
  <1> *;

}



-keep class androidx.core.app.CoreComponentFactory

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class androidx.core.app.CoreComponentFactory {

  void <init>();

}



# Keep the wm shell lib

-keep class com.android.wm.shell.*

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep class com.android.wm.shell.* {

  void <init>();

}

# Keep the protolog group methods that are called by the generated code

-keepclassmembers class com.android.wm.shell.protolog.ShellProtoLogGroup {

    *;

services/proguard.flags

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ 


# APIs referenced by dependent JAR files and modules

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

-keep interface android.annotation.SystemApi

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep interface android.annotation.SystemApi {

  void <init>();

}

-keep @android.annotation.SystemApi class * {

  public protected *;

}