2 files changed, 23 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 84a6129e8c4d..4ec586eedb6f 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -60,6 +60,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.security.KeyChain;
 import android.text.Editable;
 import android.text.InputType;
@@ -2535,6 +2536,20 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
     public void loadDataWithBaseURL(String baseUrl, String data,
             String mimeType, String encoding, String historyUrl) {
 
+        String debug_prop = "ro.debug.loadDataWithBaseURL";
+        if (SystemProperties.getBoolean(debug_prop, false)) {
+            String[] ary = data.split("\n", -1);
+            for (String ele: ary){
+                /**
+                 * Here we only debug the application that use this
+                 * loadDataWithBaseURL method, so we set the the log tag to
+                 * WebViewClassic.loadDataWithBaseURL instead of webview
+                 * defined by the LOGTAG variable
+                 * */
+                Log.d("WebViewClassic.loadDataWithBaseURL", ele);
+            }
+        }
+
         if (baseUrl != null && baseUrl.toLowerCase().startsWith("data:")) {
             loadDataImpl(data, mimeType, encoding);
             return;
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 3949afdd4a2a..d085c5e8054d 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -16,10 +16,12 @@
 
 package android.graphics;
 
+import android.os.SystemProperties;
 import android.text.GraphicsOperations;
 import android.text.SpannableString;
 import android.text.SpannedString;
 import android.text.TextUtils;
+import android.util.Log;
 
 import javax.microedition.khronos.opengles.GL;
 
@@ -37,6 +39,9 @@ import javax.microedition.khronos.opengles.GL;
  * Canvas and Drawables</a> developer guide.</p></div>
  */
 public class Canvas {
+
+    static final String LOG_TAG = "Canvas";
+
     // assigned in constructors, freed in finalizer
     final int mNativeCanvas;
     
@@ -1342,6 +1347,9 @@ public class Canvas {
      * @param paint The paint used for the text (e.g. color, size, style)
      */
     public void drawText(String text, float x, float y, Paint paint) {
+        if (SystemProperties.getBoolean("ro.debug.drawtext", false)) {
+            Log.d(LOG_TAG, text);
+        }
         native_drawText(mNativeCanvas, text, 0, text.length(), x, y, paint.mBidiFlags,
                 paint.mNativePaint);
     }