From cb56dc3968f651f13d9f61bff9c9ad22102c202d Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Thu, 7 Nov 2019 14:40:30 -0500 Subject: [PATCH] Don't mark Services and Activities as @Singleton Android gets to choose when to create services. If Dagger has them marked as @Singleton, then it hangs onto the references forever, and this causes problems. Bug: 143895143 Test: manual Change-Id: Iee61fc8d6f70e01af167cc215ae7dcde235687af --- .../src/com/android/systemui/keyguard/KeyguardService.java | 2 -- .../com/android/systemui/screenshot/TakeScreenshotService.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 9f4056fdf65bd..cb83656c38424 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -36,9 +36,7 @@ import com.android.internal.policy.IKeyguardStateCallback; import com.android.systemui.SystemUIApplication; import javax.inject.Inject; -import javax.inject.Singleton; -@Singleton public class KeyguardService extends Service { static final String TAG = "KeyguardService"; static final String PERMISSION = android.Manifest.permission.CONTROL_KEYGUARD; diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java index 20d24e62fc0a0..fd63506ef9837 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java @@ -28,9 +28,7 @@ import android.util.Log; import android.view.WindowManager; import javax.inject.Inject; -import javax.inject.Singleton; -@Singleton public class TakeScreenshotService extends Service { private static final String TAG = "TakeScreenshotService";