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

Commit 75beed6e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update SystemUI to use platform WeaklyReferencedCallback annotation" into main

parents a8f414fd 3378e667

packages/SystemUI/proguard_common.flags

+0 −22
Original line number Diff line number Diff line
@@ -7,28 +7,6 @@ 
  public void <init>();

}



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

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

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

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

}

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

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

  <1> *;

}



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

-keep class androidx.core.app.CoreComponentFactory {

  void <init>();

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import android.view.WindowManagerPolicyConstants; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.annotations.WeaklyReferencedCallback;

import com.android.settingslib.fuelgauge.BatteryStatus;

import com.android.systemui.plugins.clocks.WeatherData;

import com.android.systemui.statusbar.KeyguardIndicationController;

import com.android.systemui.util.annotations.WeaklyReferencedCallback;



import java.util.TimeZone;

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.service.dreams.DreamService; 
import androidx.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.WeaklyReferencedCallback;

import com.android.systemui.complication.Complication;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;
@@ -29,7 +30,6 @@ import com.android.systemui.flags.Flags; 
import com.android.systemui.log.LogBuffer;

import com.android.systemui.log.dagger.DreamLog;

import com.android.systemui.statusbar.policy.CallbackController;

import com.android.systemui.util.annotations.WeaklyReferencedCallback;

import com.android.systemui.util.reference.WeakReferenceFactory;



import java.lang.ref.WeakReference;

packages/SystemUI/src/com/android/systemui/privacy/PrivacyConfig.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.privacy 


import android.provider.DeviceConfig

import com.android.internal.annotations.VisibleForTesting

import com.android.internal.annotations.WeaklyReferencedCallback

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton
@@ -25,7 +26,6 @@ import com.android.systemui.dagger.qualifiers.Main 
import com.android.systemui.dump.DumpManager

import com.android.systemui.util.DeviceConfigProxy

import com.android.systemui.util.asIndenting

import com.android.systemui.util.annotations.WeaklyReferencedCallback

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.withIncreasedIndent

import java.io.PrintWriter

packages/SystemUI/src/com/android/systemui/settings/DisplayTracker.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.settings



import android.view.Display

import com.android.systemui.util.annotations.WeaklyReferencedCallback

import com.android.internal.annotations.WeaklyReferencedCallback

import java.util.concurrent.Executor



/**