Merge "Update code style for easier merging" into tm-qpr-dev am: 6ae3e60fe2 am: 2fae24e63b

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

Change-Id: I7726bb699deba959aaa33588aac8ee73b0f93c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter Kalauskas
2023-01-31 17:22:16 +00:00
committed by Automerger Merge Worker

View File

@@ -356,13 +356,22 @@ public class ThemeOverlayController implements CoreStartable, Dumpable {
};
@Inject
public ThemeOverlayController(Context context, BroadcastDispatcher broadcastDispatcher,
@Background Handler bgHandler, @Main Executor mainExecutor,
@Background Executor bgExecutor, ThemeOverlayApplier themeOverlayApplier,
SecureSettings secureSettings, WallpaperManager wallpaperManager,
UserManager userManager, DeviceProvisionedController deviceProvisionedController,
UserTracker userTracker, DumpManager dumpManager, FeatureFlags featureFlags,
@Main Resources resources, WakefulnessLifecycle wakefulnessLifecycle) {
public ThemeOverlayController(
Context context,
BroadcastDispatcher broadcastDispatcher,
@Background Handler bgHandler,
@Main Executor mainExecutor,
@Background Executor bgExecutor,
ThemeOverlayApplier themeOverlayApplier,
SecureSettings secureSettings,
WallpaperManager wallpaperManager,
UserManager userManager,
DeviceProvisionedController deviceProvisionedController,
UserTracker userTracker,
DumpManager dumpManager,
FeatureFlags featureFlags,
@Main Resources resources,
WakefulnessLifecycle wakefulnessLifecycle) {
mContext = context;
mIsMonetEnabled = featureFlags.isEnabled(Flags.MONET);
mDeviceProvisionedController = deviceProvisionedController;