From 018bb2af0c93aca81e37f0e43e8888ce0f8a46ac Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 15 Oct 2021 09:21:19 -0700 Subject: [PATCH] Add final modifier to private static DEBUG constants Marking final allows the gated debug code (generally logging) to be stripped from production builds. This saves ~20KB from system server. Follow-up work will explore presubmit guards for similar DEBUG cases (including guarding against DEBUG = true). Bug: 203143243 Test: m Change-Id: Ic87a8d8bf183ac0b36c790a2f4a4661ae5e1a87f --- .../java/android/media/BaseMediaParceledListSlice.java | 2 +- core/java/android/app/WallpaperManager.java | 2 +- .../src/com/android/keyguard/KeyguardDisplayManager.java | 2 +- .../com/android/server/appwidget/AppWidgetServiceImpl.java | 2 +- .../java/com/android/server/display/DisplayPowerState.java | 2 +- .../com/android/server/media/AudioPlayerStateMonitor.java | 2 +- .../textclassifier/TextClassificationManagerService.java | 5 +++-- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apex/media/framework/java/android/media/BaseMediaParceledListSlice.java b/apex/media/framework/java/android/media/BaseMediaParceledListSlice.java index fb666098301a9..915f3f6a3fb0b 100644 --- a/apex/media/framework/java/android/media/BaseMediaParceledListSlice.java +++ b/apex/media/framework/java/android/media/BaseMediaParceledListSlice.java @@ -43,7 +43,7 @@ import java.util.List; */ abstract class BaseMediaParceledListSlice implements Parcelable { private static String TAG = "BaseMediaParceledListSlice"; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; /* * TODO get this number from somewhere else. For now set it to a quarter of diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index a53ef1badca77..b3fad21f2e445 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -108,7 +108,7 @@ import java.util.concurrent.TimeUnit; @SystemService(Context.WALLPAPER_SERVICE) public class WallpaperManager { private static String TAG = "WallpaperManager"; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; private float mWallpaperXStep = -1; private float mWallpaperYStep = -1; private static final @NonNull RectF LOCAL_COLOR_BOUNDS = diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java index cac90ea60e97c..8c7ede26e2e61 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java @@ -49,7 +49,7 @@ import dagger.Lazy; public class KeyguardDisplayManager { protected static final String TAG = "KeyguardDisplayManager"; - private static boolean DEBUG = KeyguardConstants.DEBUG; + private static final boolean DEBUG = KeyguardConstants.DEBUG; private MediaRouter mMediaRouter = null; private final DisplayManager mDisplayService; diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index c32543ae5c13d..78d9095853f74 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -147,7 +147,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku OnCrossProfileWidgetProvidersChangeListener { private static final String TAG = "AppWidgetServiceImpl"; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; private static final String OLD_KEYGUARD_HOST_PACKAGE = "android"; private static final String NEW_KEYGUARD_HOST_PACKAGE = "com.android.keyguard"; diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index 147050cd271fe..2f22d33f552aa 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -48,7 +48,7 @@ import java.io.PrintWriter; final class DisplayPowerState { private static final String TAG = "DisplayPowerState"; - private static boolean DEBUG = false; + private static final boolean DEBUG = false; private static String COUNTER_COLOR_FADE = "ColorFadeLevel"; private final Handler mHandler; diff --git a/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java b/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java index d285c437a3df3..487346763f0f8 100644 --- a/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java +++ b/services/core/java/com/android/server/media/AudioPlayerStateMonitor.java @@ -40,7 +40,7 @@ import java.util.Set; * Monitors the state changes of audio players. */ class AudioPlayerStateMonitor { - private static boolean DEBUG = MediaSessionService.DEBUG; + private static final boolean DEBUG = MediaSessionService.DEBUG; private static String TAG = "AudioPlayerStateMonitor"; private static AudioPlayerStateMonitor sInstance; diff --git a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java index 0f37450c24c97..e98fa28634a45 100644 --- a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java +++ b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java @@ -86,6 +86,9 @@ public final class TextClassificationManagerService extends ITextClassifierServi private static final String LOG_TAG = "TextClassificationManagerService"; + // TODO: consider using device config to control it. + private static final boolean DEBUG = false; + private static final ITextClassifierCallback NO_OP_CALLBACK = new ITextClassifierCallback() { @Override public void onSuccess(Bundle result) {} @@ -175,8 +178,6 @@ public final class TextClassificationManagerService extends ITextClassifierServi private final String mDefaultTextClassifierPackage; @Nullable private final String mSystemTextClassifierPackage; - // TODO: consider using device config to control it. - private boolean DEBUG = false; private TextClassificationManagerService(Context context) { mContext = Objects.requireNonNull(context);