From ffa829f779d7513c64bba76cc884c62b702f52dd Mon Sep 17 00:00:00 2001 From: Ben Kwa Date: Tue, 22 Mar 2016 11:11:46 -0700 Subject: [PATCH] DocsUI: Disable debug logging by default. Per the platform team, we shouldn't enable debug logging automatically in debug builds because it increases log-spam. Just disable the flag and enable it manually when needed. Add some ifs to make sure all our debug logging is properly removed. BUG=27380154 Change-Id: I8338f226c07affdb65970c7cb14f1e6aae036934 --- .../src/com/android/documentsui/DocumentsActivity.java | 4 ++-- .../src/com/android/documentsui/FilesActivity.java | 2 +- .../android/documentsui/OpenExternalDirectoryActivity.java | 2 +- .../src/com/android/documentsui/RecentsProvider.java | 3 ++- .../src/com/android/documentsui/SearchViewManager.java | 6 ++++-- .../DocumentsUI/src/com/android/documentsui/Shared.java | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 770e35d631ba1..805d87776ea91 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -190,7 +190,7 @@ public class DocumentsActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.d(TAG, "onActivityResult() code=" + resultCode); + if (DEBUG) Log.d(TAG, "onActivityResult() code=" + resultCode); // Only relay back results when not canceled; otherwise stick around to // let the user pick another app/backend. @@ -414,7 +414,7 @@ public class DocumentsActivity extends BaseActivity { @Override void onTaskFinished(Uri... uris) { - Log.d(TAG, "onFinished() " + Arrays.toString(uris)); + if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris)); final Intent intent = new Intent(); if (uris.length == 1) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index fe2dc8ee2e480..a6eba41254425 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -414,7 +414,7 @@ public class FilesActivity extends BaseActivity { @Override void onTaskFinished(Uri... uris) { - Log.d(TAG, "onFinished() " + Arrays.toString(uris)); + if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris)); final Intent intent = new Intent(); if (uris.length == 1) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java index 2b6f3968e203a..ab45af148de86 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java @@ -282,7 +282,7 @@ public class OpenExternalDirectoryActivity extends Activity { logInvalidScopedAccessRequest(context, SCOPED_DIRECTORY_ACCESS_ERROR); return null; } - Log.d(TAG, "doc id for " + file + ": " + docId); + if (DEBUG) Log.d(TAG, "doc id for " + file + ": " + docId); final Uri uri = DocumentsContract.buildTreeDocumentUri(EXTERNAL_STORAGE_AUTH, docId); if (uri == null) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java index e1b1c09be3643..6ef9154451a24 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java @@ -16,6 +16,7 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; import static com.android.documentsui.model.DocumentInfo.getCursorString; import android.content.ContentProvider; @@ -338,7 +339,7 @@ public class RecentsProvider extends ContentProvider { if (predicate.apply(authority)) { db.delete(TABLE_STATE, StateColumns.AUTHORITY + "=?", new String[] { authority }); - Log.d(TAG, "Purged state for " + authority); + if (DEBUG) Log.d(TAG, "Purged state for " + authority); } } } finally { diff --git a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java b/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java index 63dc2ee3796ee..4d0ba4b79346b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java @@ -16,6 +16,8 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; + import android.annotation.Nullable; import android.os.Bundle; import android.provider.DocumentsContract.Root; @@ -80,7 +82,7 @@ final class SearchViewManager implements */ void update(RootInfo root) { if (mMenu == null) { - Log.d(TAG, "update called before Search MenuItem installed."); + if (DEBUG) Log.d(TAG, "update called before Search MenuItem installed."); return; } @@ -108,7 +110,7 @@ final class SearchViewManager implements void showMenu(boolean visible) { if (mMenu == null) { - Log.d(TAG, "showMenu called before Search MenuItem installed."); + if (DEBUG) Log.d(TAG, "showMenu called before Search MenuItem installed."); return; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/Shared.java b/packages/DocumentsUI/src/com/android/documentsui/Shared.java index 6f1863e313c5c..11c59337c2f51 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Shared.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Shared.java @@ -33,7 +33,7 @@ public final class Shared { public static final String TAG = "Documents"; - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; /** Intent action name to pick a copy destination. */ public static final String ACTION_PICK_COPY_DESTINATION =