From 8709a3a505296bb588e4f2a21d5609762639f4df Mon Sep 17 00:00:00 2001 From: Michael W Date: Fri, 15 Nov 2024 21:01:39 +0100 Subject: [PATCH] sdk: Optimize imports Reordering and removing unused ones Change-Id: I1fff9c6f11c71022dbf4207ee042d2ee2ff77ee6 --- .../platform/internal/LineageBaseFeature.java | 6 +-- .../internal/LineageGlobalActionsService.java | 12 ++---- .../internal/LineageHardwareService.java | 10 ++--- .../internal/LineageSystemServer.java | 1 + .../internal/LineageSystemService.java | 2 + .../internal/ProfileManagerService.java | 39 ++++++++++--------- .../internal/ProfileTriggerHelper.java | 1 + .../internal/TrustInterfaceService.java | 2 +- .../common/LineageSystemServiceHelper.java | 1 + .../display/ColorTemperatureController.java | 14 +++---- .../display/DisplayHardwareController.java | 8 ++-- .../internal/display/LiveDisplayFeature.java | 12 +++--- .../internal/display/LiveDisplayService.java | 20 +++++----- .../display/OutdoorModeController.java | 8 ++-- .../display/PictureAdjustmentController.java | 13 ++++--- .../health/ChargingControlController.java | 20 +++++----- .../health/HealthInterfaceService.java | 3 +- 17 files changed, 88 insertions(+), 84 deletions(-) diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageBaseFeature.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageBaseFeature.java index a7f94201..7d36cda5 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageBaseFeature.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageBaseFeature.java @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -13,10 +13,10 @@ import android.os.UserHandle; import org.lineageos.platform.internal.common.UserContentObserver; -import java.io.PrintWriter; - import lineageos.providers.LineageSettings; +import java.io.PrintWriter; + public abstract class LineageBaseFeature { protected final Context mContext; protected final Handler mHandler; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageGlobalActionsService.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageGlobalActionsService.java index 5e542642..5f638ca8 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageGlobalActionsService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageGlobalActionsService.java @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 The LineageOS Project + * SPDX-FileCopyrightText: 2021-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -8,26 +8,22 @@ package org.lineageos.platform.internal; import static lineageos.providers.LineageSettings.Secure.POWER_MENU_ACTIONS; import static lineageos.providers.LineageSettings.Secure.getStringForUser; import static lineageos.providers.LineageSettings.Secure.putStringForUser; - import static org.lineageos.internal.util.PowerMenuConstants.GLOBAL_ACTION_KEY_BUGREPORT; -import static org.lineageos.internal.util.PowerMenuConstants.GLOBAL_ACTION_KEY_LOCKDOWN; import android.content.ContentResolver; import android.content.Context; -import android.content.res.Resources; import android.database.ContentObserver; import android.net.Uri; -import android.os.Binder; import android.os.Handler; import android.os.IBinder; import android.os.UserHandle; import android.provider.Settings; -import lineageos.app.LineageContextConstants; -import lineageos.app.ILineageGlobalActions; - import org.lineageos.internal.util.PowerMenuConstants; +import lineageos.app.ILineageGlobalActions; +import lineageos.app.LineageContextConstants; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java index e209ca15..85f05ac4 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageHardwareService.java @@ -1,26 +1,26 @@ /* * SPDX-FileCopyrightText: 2015-2016 The CyanogenMod Project - * SPDX-FileCopyrightText: 2017-2020 The LineageOS Project + * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal; +import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_GRAYSCALE; +import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_NIGHT_DISPLAY; + import android.content.Context; import android.content.Intent; import android.os.IBinder; import android.os.UserHandle; import android.util.Log; -import com.android.server.display.color.DisplayTransformManager; import com.android.server.LocalServices; +import com.android.server.display.color.DisplayTransformManager; import lineageos.app.LineageContextConstants; import lineageos.hardware.ILineageHardwareService; import lineageos.hardware.LineageHardwareManager; -import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_NIGHT_DISPLAY; -import static com.android.server.display.color.DisplayTransformManager.LEVEL_COLOR_MATRIX_GRAYSCALE; - /** @hide */ public class LineageHardwareService extends LineageSystemService { diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemServer.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemServer.java index b2f1f1b6..751f71de 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemServer.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemServer.java @@ -9,6 +9,7 @@ package org.lineageos.platform.internal; import android.content.Context; import android.os.SystemProperties; import android.util.Slog; + import com.android.server.LocalServices; import com.android.server.SystemServiceManager; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemService.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemService.java index db4c5ed4..8c044faf 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSystemService.java @@ -1,11 +1,13 @@ /* * SPDX-FileCopyrightText: 2016 The CyanogenMod Project + * SPDX-FileCopyrightText: 2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal; import android.content.Context; + import com.android.server.SystemService; public abstract class LineageSystemService extends SystemService { diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java index 0bf510eb..fedd604f 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileManagerService.java @@ -6,51 +6,52 @@ package org.lineageos.platform.internal; +import android.app.ActivityManagerNative; +import android.app.NotificationGroup; +import android.app.backup.BackupManager; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; +import android.content.BroadcastReceiver; import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; +import android.content.res.XmlResourceParser; import android.database.ContentObserver; import android.net.Uri; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; +import android.os.Environment; +import android.os.Handler; +import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.ParcelUuid; +import android.os.UserHandle; +import android.text.TextUtils; import android.util.ArraySet; +import android.util.Log; + import com.android.internal.policy.IKeyguardService; -import lineageos.providers.LineageSettings; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; -import android.app.ActivityManagerNative; -import android.app.NotificationGroup; -import android.app.backup.BackupManager; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.res.XmlResourceParser; -import android.os.Environment; -import android.os.Handler; -import android.os.UserHandle; -import android.os.IBinder; -import android.text.TextUtils; -import android.util.Log; -import android.os.ParcelUuid; - +import lineageos.app.IProfileManager; import lineageos.app.LineageContextConstants; import lineageos.app.Profile; import lineageos.app.ProfileGroup; import lineageos.app.ProfileManager; -import lineageos.app.IProfileManager; +import lineageos.providers.LineageSettings; -import java.util.Collection; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileTriggerHelper.java b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileTriggerHelper.java index 76c4276f..6c2279b9 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/ProfileTriggerHelper.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/ProfileTriggerHelper.java @@ -18,6 +18,7 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.UserHandle; import android.util.Log; + import lineageos.app.Profile; import lineageos.app.Profile.ProfileTrigger; import lineageos.app.ProfileManager; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java index 903dfe25..85013adb 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java @@ -19,9 +19,9 @@ import android.content.pm.PackageManager; import android.os.IBinder; import android.os.SELinux; import android.os.SystemProperties; +import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import android.text.TextUtils; import lineageos.app.LineageContextConstants; import lineageos.providers.LineageSettings; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/common/LineageSystemServiceHelper.java b/lineage/lib/main/java/org/lineageos/platform/internal/common/LineageSystemServiceHelper.java index e6e02788..ac932030 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/common/LineageSystemServiceHelper.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/common/LineageSystemServiceHelper.java @@ -7,6 +7,7 @@ package org.lineageos.platform.internal.common; import android.content.Context; + import org.lineageos.platform.internal.LineageSystemService; import java.lang.reflect.Constructor; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/ColorTemperatureController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/ColorTemperatureController.java index f01d557a..d22b21d1 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/ColorTemperatureController.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/ColorTemperatureController.java @@ -5,6 +5,11 @@ */ package org.lineageos.platform.internal.display; +import static lineageos.hardware.LiveDisplayManager.MODE_AUTO; +import static lineageos.hardware.LiveDisplayManager.MODE_DAY; +import static lineageos.hardware.LiveDisplayManager.MODE_NIGHT; +import static lineageos.hardware.LiveDisplayManager.MODE_OFF; + import android.animation.ValueAnimator; import android.content.Context; import android.net.Uri; @@ -17,18 +22,13 @@ import android.view.animation.AccelerateDecelerateInterpolator; import org.lineageos.platform.internal.display.TwilightTracker.TwilightState; -import java.io.PrintWriter; -import java.util.BitSet; - import lineageos.hardware.LineageHardwareManager; import lineageos.hardware.LiveDisplayManager; import lineageos.providers.LineageSettings; import lineageos.util.ColorUtils; -import static lineageos.hardware.LiveDisplayManager.MODE_AUTO; -import static lineageos.hardware.LiveDisplayManager.MODE_DAY; -import static lineageos.hardware.LiveDisplayManager.MODE_NIGHT; -import static lineageos.hardware.LiveDisplayManager.MODE_OFF; +import java.io.PrintWriter; +import java.util.BitSet; public class ColorTemperatureController extends LiveDisplayFeature { diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/DisplayHardwareController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/DisplayHardwareController.java index 2cf403f2..ada1f96e 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/DisplayHardwareController.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/DisplayHardwareController.java @@ -18,15 +18,15 @@ import android.util.MathUtils; import android.util.Slog; import android.view.animation.LinearInterpolator; +import lineageos.hardware.LineageHardwareManager; +import lineageos.hardware.LiveDisplayManager; +import lineageos.providers.LineageSettings; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; -import lineageos.hardware.LineageHardwareManager; -import lineageos.hardware.LiveDisplayManager; -import lineageos.providers.LineageSettings; - public class DisplayHardwareController extends LiveDisplayFeature { private final LineageHardwareManager mHardware; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayFeature.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayFeature.java index b99f5433..dee68ace 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayFeature.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayFeature.java @@ -1,10 +1,15 @@ /* * SPDX-FileCopyrightText: 2016 The CyanogenMod Project - * SPDX-FileCopyrightText: 2017-2019 The LineageOS Project + * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal.display; +import static org.lineageos.platform.internal.display.LiveDisplayService.ALL_CHANGED; +import static org.lineageos.platform.internal.display.LiveDisplayService.DISPLAY_CHANGED; +import static org.lineageos.platform.internal.display.LiveDisplayService.MODE_CHANGED; +import static org.lineageos.platform.internal.display.LiveDisplayService.TWILIGHT_CHANGED; + import android.content.Context; import android.hardware.display.ColorDisplayManager; import android.os.Handler; @@ -16,11 +21,6 @@ import org.lineageos.platform.internal.display.TwilightTracker.TwilightState; import java.util.BitSet; -import static org.lineageos.platform.internal.display.LiveDisplayService.ALL_CHANGED; -import static org.lineageos.platform.internal.display.LiveDisplayService.DISPLAY_CHANGED; -import static org.lineageos.platform.internal.display.LiveDisplayService.MODE_CHANGED; -import static org.lineageos.platform.internal.display.LiveDisplayService.TWILIGHT_CHANGED; - public abstract class LiveDisplayFeature extends LineageBaseFeature { protected static final String TAG = "LiveDisplay"; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java index 7240110e..13a3c1a7 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java @@ -5,6 +5,10 @@ */ package org.lineageos.platform.internal.display; +import static lineageos.hardware.LiveDisplayManager.MODE_FIRST; +import static lineageos.hardware.LiveDisplayManager.MODE_LAST; +import static lineageos.hardware.LiveDisplayManager.MODE_OFF; + import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -30,6 +34,12 @@ import org.lineageos.platform.internal.common.UserContentObserver; import org.lineageos.platform.internal.display.TwilightTracker.TwilightListener; import org.lineageos.platform.internal.display.TwilightTracker.TwilightState; +import lineageos.app.LineageContextConstants; +import lineageos.hardware.HSIC; +import lineageos.hardware.ILiveDisplayService; +import lineageos.hardware.LiveDisplayConfig; +import lineageos.providers.LineageSettings; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; @@ -38,16 +48,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import lineageos.app.LineageContextConstants; -import lineageos.hardware.HSIC; -import lineageos.hardware.ILiveDisplayService; -import lineageos.hardware.LiveDisplayConfig; -import lineageos.providers.LineageSettings; - -import static lineageos.hardware.LiveDisplayManager.MODE_FIRST; -import static lineageos.hardware.LiveDisplayManager.MODE_LAST; -import static lineageos.hardware.LiveDisplayManager.MODE_OFF; - /** * LiveDisplay is an advanced set of features for improving * display quality under various ambient conditions. diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java index 53f1426f..2a07a17c 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java @@ -1,6 +1,6 @@ /* * SPDX-FileCopyrightText: 2016 The CyanogenMod Project - * SPDX-FileCopyrightText: 2019 The LineageOS Project + * SPDX-FileCopyrightText: 2019-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal.display; @@ -13,13 +13,13 @@ import android.content.Context; import android.net.Uri; import android.os.Handler; -import java.io.PrintWriter; -import java.util.BitSet; - import lineageos.hardware.LineageHardwareManager; import lineageos.hardware.LiveDisplayManager; import lineageos.providers.LineageSettings; +import java.io.PrintWriter; +import java.util.BitSet; + public class OutdoorModeController extends LiveDisplayFeature { private final LineageHardwareManager mHardware; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java index 9e98ef54..a4d59bbf 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/PictureAdjustmentController.java @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2016 The CyanogenMod Project + * SPDX-FileCopyrightText: 2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ package org.lineageos.platform.internal.display; @@ -12,17 +13,17 @@ import android.util.Range; import android.util.Slog; import android.util.SparseArray; +import lineageos.hardware.DisplayMode; +import lineageos.hardware.HSIC; +import lineageos.hardware.LineageHardwareManager; +import lineageos.hardware.LiveDisplayManager; +import lineageos.providers.LineageSettings; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import lineageos.hardware.LineageHardwareManager; -import lineageos.hardware.DisplayMode; -import lineageos.hardware.HSIC; -import lineageos.hardware.LiveDisplayManager; -import lineageos.providers.LineageSettings; - public class PictureAdjustmentController extends LiveDisplayFeature { private static final String TAG = "LiveDisplay-PAC"; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/health/ChargingControlController.java b/lineage/lib/main/java/org/lineageos/platform/internal/health/ChargingControlController.java index 0ab1f278..f69f69a1 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/health/ChargingControlController.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/health/ChargingControlController.java @@ -5,6 +5,11 @@ package org.lineageos.platform.internal.health; +import static lineageos.health.HealthInterface.MODE_AUTO; +import static lineageos.health.HealthInterface.MODE_LIMIT; +import static lineageos.health.HealthInterface.MODE_MANUAL; +import static lineageos.health.HealthInterface.MODE_NONE; + import static java.time.format.FormatStyle.SHORT; import android.app.AlarmManager; @@ -29,6 +34,11 @@ import android.util.Log; import org.lineageos.platform.internal.R; +import lineageos.providers.LineageSettings; + +import vendor.lineage.health.ChargingControlSupportedMode; +import vendor.lineage.health.IChargingControl; + import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.time.Instant; @@ -40,16 +50,6 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Calendar; -import lineageos.providers.LineageSettings; - -import vendor.lineage.health.ChargingControlSupportedMode; -import vendor.lineage.health.IChargingControl; - -import static lineageos.health.HealthInterface.MODE_NONE; -import static lineageos.health.HealthInterface.MODE_AUTO; -import static lineageos.health.HealthInterface.MODE_MANUAL; -import static lineageos.health.HealthInterface.MODE_LIMIT; - public class ChargingControlController extends LineageHealthFeature { private final IChargingControl mChargingControl; private final ContentResolver mContentResolver; diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/health/HealthInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/health/HealthInterfaceService.java index 6ba00aa2..31bd4947 100644 --- a/lineage/lib/main/java/org/lineageos/platform/internal/health/HealthInterfaceService.java +++ b/lineage/lib/main/java/org/lineageos/platform/internal/health/HealthInterfaceService.java @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023 The LineageOS Project + * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project * SPDX-License-Identifier: Apache-2.0 */ @@ -18,6 +18,7 @@ import org.lineageos.platform.internal.LineageSystemService; import lineageos.app.LineageContextConstants; import lineageos.health.IHealthInterface; + import vendor.lineage.health.ChargingControlSupportedMode; import java.io.FileDescriptor;