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

Commit a666e70c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure weakly referenced Kotlin callback fields are kept" into... 

Merge "Ensure weakly referenced Kotlin callback fields are kept" into tm-qpr-dev am: 5f12d744 am: 075cbffd

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



Change-Id: I14c5f7981ebc8ffd20dce86669b5e0e36346926f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8e53570 075cbffd

packages/SystemUI/proguard.flags

+32 −0
Original line number Diff line number Diff line
@@ -24,12 +24,44 @@ 
# TODO(b/264686688): Handle these cases with more targeted annotations.

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  private com.android.keyguard.KeyguardUpdateMonitorCallback *;

  private com.android.systemui.privacy.PrivacyConfig$Callback *;

  private com.android.systemui.privacy.PrivacyItemController$Callback *;

  private com.android.systemui.settings.UserTracker$Callback *;

  private com.android.systemui.statusbar.phone.StatusBarWindowCallback *;

  private com.android.systemui.util.service.Observer$Callback *;

  private com.android.systemui.util.service.ObservableServiceConnection$Callback *;

}

# Note that these rules are temporary companions to the above rules, required

# for cases like Kotlin where fields with anonymous types use the anonymous type

# rather than the supertype.

-if class * extends com.android.keyguard.KeyguardUpdateMonitorCallback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.privacy.PrivacyConfig$Callback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.privacy.PrivacyItemController$Callback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.settings.UserTracker$Callback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.statusbar.phone.StatusBarWindowCallback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.util.service.Observer$Callback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}

-if class * extends com.android.systemui.util.service.ObservableServiceConnection$Callback

-keepclassmembers,allowaccessmodification class com.android.systemui.**, com.android.keyguard.** {

  <1> *;

}



-keepclasseswithmembers class * {

    public <init>(android.content.Context, android.util.AttributeSet);