Merge "StrictMode: now in more system server threads." (5b59e02e) · Commits · e / os / android_frameworks_base

core/java/android/app/ContextImpl.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1182,6 +1182,13 @@ class ContextImpl extends Context {
		/* package */ static DropBoxManager createDropBoxManager() {
		IBinder b = ServiceManager.getService(DROPBOX_SERVICE);
		IDropBoxManagerService service = IDropBoxManagerService.Stub.asInterface(b);
		if (service == null) {
		// Don't return a DropBoxManager that will NPE upon use.
		// This also avoids caching a broken DropBoxManager in
		// getDropBoxManager during early boot, before the
		// DROPBOX_SERVICE is registered.
		return null;
		}
		return new DropBoxManager(service);
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,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;
		@@ -944,6 +945,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();
		}
		}
		@@ -981,6 +987,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();
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -1349,6 +1349,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();
		}
		}