Merge "StrictMode: now in more system server threads."

2 files changed, 16 insertions, 0 deletions

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 1cbc8324..dbc7f48 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -85,6 +85,7 @@ import android.os.PowerManager;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.StrictMode;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.TokenWatcher;
@@ -920,6 +921,11 @@ public class WindowManagerService extends IWindowManager.Stub
                 notifyAll();
             }
 
+            // For debug builds, log event loop stalls to dropbox for analysis.
+            if (StrictMode.conditionallyEnableDebugLogging()) {
+                Slog.i(TAG, "Enabled StrictMode logging for WMThread's Looper");
+            }
+
             Looper.loop();
         }
     }
@@ -957,6 +963,11 @@ public class WindowManagerService extends IWindowManager.Stub
                 notifyAll();
             }
 
+            // For debug builds, log event loop stalls to dropbox for analysis.
+            if (StrictMode.conditionallyEnableDebugLogging()) {
+                Slog.i(TAG, "Enabled StrictMode for PolicyThread's Looper");
+            }
+
             Looper.loop();
         }
     }
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 60b2b67..84839b6 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -1334,6 +1334,11 @@ public final class ActivityManagerService extends ActivityManagerNative
                 }
             }
 
+            // For debug builds, log event loop stalls to dropbox for analysis.
+            if (StrictMode.conditionallyEnableDebugLogging()) {
+                Slog.i(TAG, "Enabled StrictMode logging for AThread's Looper");
+            }
+
             Looper.loop();
         }
     }