Merge "before shipping, remove stacktrace printing in requery-warning msg"

1 files changed, 5 insertions, 2 deletions

diff --git a/core/java/android/database/sqlite/SQLiteCursor.java b/core/java/android/database/sqlite/SQLiteCursor.java
index 3fe6087..43dd5d7 100644
--- a/core/java/android/database/sqlite/SQLiteCursor.java
+++ b/core/java/android/database/sqlite/SQLiteCursor.java
@@ -393,9 +393,12 @@ public class SQLiteCursor extends AbstractWindowedCursor {
             if (!sAlreadyWarned.containsKey(databasePath)) {
                 sAlreadyWarned.put(databasePath, true);
                 String packageName = ActivityThread.currentPackageName();
+                Throwable t = null;
+                // BEGIN STOPSHIP remove the following line
+                t = new RequeryOnUiThreadException(packageName);
+                // END STOPSHIP
                 Log.w(TAG, "should not attempt requery on main (UI) thread: app = " +
-                        packageName == null ? "'unknown'" : packageName,
-                        new RequeryOnUiThreadException(packageName));
+                        packageName == null ? "'unknown'" : packageName, t);
             }
         }
     }