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

Commit 7b2f5890 authored by Jared Duke's avatar Jared Duke Committed by Automerger Merge Worker
Browse files

Merge "Ensure weakly referenced callback fields are kept" into tm-qpr-dev am: 71d0f222 

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



Change-Id: Icda43dbaee57a26ce61092f72193597bfcd38f2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2de20bb6 71d0f222

packages/SystemUI/proguard.flags

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ 
  public <init>();

}



# Needed to ensure callback field references are kept in their respective

# owning classes when the downstream callback registrars only store weak refs.

# 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.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 *;

}



-keepclasseswithmembers class * {

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

}