diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 21:24:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 21:24:30 +0000 |
| commit | af5dbf486a12dff4504d8401f661cc4dcdf9fc55 (patch) | |
| tree | e8d29d516965022e679f3eb5f700bfa0e3d3e7c5 /core/java/android | |
| parent | e6303aaa3c2059386527a289ccf97de811154eef (diff) | |
| parent | e8d9d331ae5857cc43c8e31407ced1ed0d9ac375 (diff) | |
Merge "Disabled some DEBUG constants." into qt-qpr1-dev am: e8d9d331ae
Change-Id: I7d4e49253b1ecd54dc8036e21e23e7392aa47602
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/DisabledWallpaperManager.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/java/android/app/DisabledWallpaperManager.java b/core/java/android/app/DisabledWallpaperManager.java index 518594191e6c..7151f900c5af 100644 --- a/core/java/android/app/DisabledWallpaperManager.java +++ b/core/java/android/app/DisabledWallpaperManager.java @@ -41,8 +41,7 @@ final class DisabledWallpaperManager extends WallpaperManager { // Don't need to worry about synchronization private static DisabledWallpaperManager sInstance; - // TODO(b/138939803): STOPSHIP changed to false and/or remove it - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; @NonNull static DisabledWallpaperManager getInstance() { @@ -66,10 +65,6 @@ final class DisabledWallpaperManager extends WallpaperManager { return false; } - // TODO(b/138939803): STOPSHIP methods below should not be necessary, - // callers should check if isWallpaperSupported(), consider removing them to keep this class - // simpler - private static <T> T unsupported() { if (DEBUG) Log.w(TAG, "unsupported method called; returning null", new Exception()); return null; |