From cc3fb1dc68b24a4d1558a86300b48b27a42af800 Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Mon, 25 Jun 2012 11:44:57 -0700
Subject: [PATCH] Logutils changes

Allow Email to override the log tag for UnifiedEmail code

Change-Id: I4de991371cc80704c6f4c2198d7d121f22c16f48
---
 email2/emailcommon/Android.mk                 |  1 -
 email2/src/com/android/mail/utils/LogTag.java | 28 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 email2/src/com/android/mail/utils/LogTag.java

diff --git a/email2/emailcommon/Android.mk b/email2/emailcommon/Android.mk
index 6ccebcbff..415b03185 100644
--- a/email2/emailcommon/Android.mk
+++ b/email2/emailcommon/Android.mk
@@ -25,7 +25,6 @@ apache_src_dir := ../../../UnifiedEmail/src/org
 
 imported_unified_email_files := \
         $(unified_email_src_dir)/com/android/mail/utils/LogUtils.java \
-        $(unified_email_src_dir)/com/android/mail/utils/LoggingInputStream.java \
         $(unified_email_src_dir)/com/android/mail/providers/UIProvider.java
 
 LOCAL_MODULE := com.android.emailcommon2
diff --git a/email2/src/com/android/mail/utils/LogTag.java b/email2/src/com/android/mail/utils/LogTag.java
new file mode 100644
index 000000000..b0c39879f
--- /dev/null
+++ b/email2/src/com/android/mail/utils/LogTag.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2012, Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mail.utils;
+
+public class LogTag {
+    private static String LOG_TAG = "Email";
+
+    /**
+     * Get the log tag to apply to logging.
+     */
+    public static String getLogTag() {
+        return LOG_TAG;
+    }
+}