Merge "Disabled some DEBUG constants." into qt-qpr1-dev am: e8d9d331ae

Change-Id: I7d4e49253b1ecd54dc8036e21e23e7392aa47602
This commit is contained in:
Automerger Merge Worker
2020-02-08 21:24:30 +00:00

View File

@@ -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;