Merge "Fix leak in RotationHelper registration to DeviceStateManager" into main
diff --git a/services/core/java/com/android/server/audio/RotationHelper.java b/services/core/java/com/android/server/audio/RotationHelper.java
index 394e4af..e012d17 100644
--- a/services/core/java/com/android/server/audio/RotationHelper.java
+++ b/services/core/java/com/android/server/audio/RotationHelper.java
@@ -80,6 +80,7 @@
sContext = context;
sHandler = handler;
sDisplayListener = new AudioDisplayListener();
+ sFoldStateListener = new FoldStateListener(sContext, RotationHelper::updateFoldState);
sRotationCallback = rotationCallback;
sFoldStateCallback = foldStateCallback;
enable();
@@ -90,7 +91,6 @@
.registerDisplayListener(sDisplayListener, sHandler);
updateOrientation();
- sFoldStateListener = new FoldStateListener(sContext, folded -> updateFoldState(folded));
sContext.getSystemService(DeviceStateManager.class)
.registerCallback(new HandlerExecutor(sHandler), sFoldStateListener);
}