am 46a8b1ac: Merge "Remove unused, obsolete debug code" into jb-dev (6fa51de8) · Commits · e / os / android_frameworks_base

api/16.txt

+10 −10

Original line number	Diff line number	Diff line
		@@ -24512,14 +24512,14 @@ package android.view {
		public class ViewDebug {
		ctor public ViewDebug();
		method public static void dumpCapturedView(java.lang.String, java.lang.Object);
		method public static void startHierarchyTracing(java.lang.String, android.view.View);
		method public static void startRecyclerTracing(java.lang.String, android.view.View);
		method public static void stopHierarchyTracing();
		method public static void stopRecyclerTracing();
		method public static void trace(android.view.View, android.view.ViewDebug.RecyclerTraceType, int...);
		method public static void trace(android.view.View, android.view.ViewDebug.HierarchyTraceType);
		field public static final boolean TRACE_HIERARCHY = false;
		field public static final boolean TRACE_RECYCLER = false;
		method public static deprecated void startHierarchyTracing(java.lang.String, android.view.View);
		method public static deprecated void startRecyclerTracing(java.lang.String, android.view.View);
		method public static deprecated void stopHierarchyTracing();
		method public static deprecated void stopRecyclerTracing();
		method public static deprecated void trace(android.view.View, android.view.ViewDebug.RecyclerTraceType, int...);
		method public static deprecated void trace(android.view.View, android.view.ViewDebug.HierarchyTraceType);
		field public static final deprecated boolean TRACE_HIERARCHY = false;
		field public static final deprecated boolean TRACE_RECYCLER = false;
		}

		public static abstract class ViewDebug.CapturedViewProperty implements java.lang.annotation.Annotation {
		@@ -24531,7 +24531,7 @@ package android.view {
		public static abstract class ViewDebug.FlagToString implements java.lang.annotation.Annotation {
		}

		public static final class ViewDebug.HierarchyTraceType extends java.lang.Enum {
		public static final deprecated class ViewDebug.HierarchyTraceType extends java.lang.Enum {
		method public static android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String);
		method public static final android.view.ViewDebug.HierarchyTraceType[] values();
		enum_constant public static final android.view.ViewDebug.HierarchyTraceType BUILD_CACHE;
		@@ -24547,7 +24547,7 @@ package android.view {
		public static abstract class ViewDebug.IntToString implements java.lang.annotation.Annotation {
		}

		public static final class ViewDebug.RecyclerTraceType extends java.lang.Enum {
		public static final deprecated class ViewDebug.RecyclerTraceType extends java.lang.Enum {
		method public static android.view.ViewDebug.RecyclerTraceType valueOf(java.lang.String);
		method public static final android.view.ViewDebug.RecyclerTraceType[] values();
		enum_constant public static final android.view.ViewDebug.RecyclerTraceType BIND_VIEW;

api/current.txt

+10 −10

Original line number	Diff line number	Diff line
		@@ -24512,14 +24512,14 @@ package android.view {
		public class ViewDebug {
		ctor public ViewDebug();
		method public static void dumpCapturedView(java.lang.String, java.lang.Object);
		method public static void startHierarchyTracing(java.lang.String, android.view.View);
		method public static void startRecyclerTracing(java.lang.String, android.view.View);
		method public static void stopHierarchyTracing();
		method public static void stopRecyclerTracing();
		method public static void trace(android.view.View, android.view.ViewDebug.RecyclerTraceType, int...);
		method public static void trace(android.view.View, android.view.ViewDebug.HierarchyTraceType);
		field public static final boolean TRACE_HIERARCHY = false;
		field public static final boolean TRACE_RECYCLER = false;
		method public static deprecated void startHierarchyTracing(java.lang.String, android.view.View);
		method public static deprecated void startRecyclerTracing(java.lang.String, android.view.View);
		method public static deprecated void stopHierarchyTracing();
		method public static deprecated void stopRecyclerTracing();
		method public static deprecated void trace(android.view.View, android.view.ViewDebug.RecyclerTraceType, int...);
		method public static deprecated void trace(android.view.View, android.view.ViewDebug.HierarchyTraceType);
		field public static final deprecated boolean TRACE_HIERARCHY = false;
		field public static final deprecated boolean TRACE_RECYCLER = false;
		}

		public static abstract class ViewDebug.CapturedViewProperty implements java.lang.annotation.Annotation {
		@@ -24531,7 +24531,7 @@ package android.view {
		public static abstract class ViewDebug.FlagToString implements java.lang.annotation.Annotation {
		}

		public static final class ViewDebug.HierarchyTraceType extends java.lang.Enum {
		public static final deprecated class ViewDebug.HierarchyTraceType extends java.lang.Enum {
		method public static android.view.ViewDebug.HierarchyTraceType valueOf(java.lang.String);
		method public static final android.view.ViewDebug.HierarchyTraceType[] values();
		enum_constant public static final android.view.ViewDebug.HierarchyTraceType BUILD_CACHE;
		@@ -24547,7 +24547,7 @@ package android.view {
		public static abstract class ViewDebug.IntToString implements java.lang.annotation.Annotation {
		}

		public static final class ViewDebug.RecyclerTraceType extends java.lang.Enum {
		public static final deprecated class ViewDebug.RecyclerTraceType extends java.lang.Enum {
		method public static android.view.ViewDebug.RecyclerTraceType valueOf(java.lang.String);
		method public static final android.view.ViewDebug.RecyclerTraceType[] values();
		enum_constant public static final android.view.ViewDebug.RecyclerTraceType BIND_VIEW;

cmds/am/src/com/android/commands/am/Am.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -645,10 +645,6 @@ public class Am {
		String process = null;

		String cmd = nextArgRequired();
		if ("looper".equals(cmd)) {
		cmd = nextArgRequired();
		profileType = 1;
		}

		if ("start".equals(cmd)) {
		start = true;
		@@ -1295,8 +1291,8 @@ public class Am {
		" am broadcast <INTENT>\n" +
		" am instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]\n" +
		" [--no-window-animation] <COMPONENT>\n" +
		" am profile [looper] start <PROCESS> <FILE>\n" +
		" am profile [looper] stop [<PROCESS>]\n" +
		" am profile start <PROCESS> <FILE>\n" +
		" am profile stop [<PROCESS>]\n" +
		" am dumpheap [flags] <PROCESS> <FILE>\n" +
		" am set-debug-app [-w] [--persistent] <PACKAGE>\n" +
		" am clear-debug-app\n" +

core/java/android/app/ActivityThread.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -3751,9 +3751,6 @@ public final class ActivityThread {
		if (start) {
		try {
		switch (profileType) {
		case 1:
		ViewDebug.startLooperProfiling(pcd.path, pcd.fd.getFileDescriptor());
		break;
		default:
		mProfiler.setProfiler(pcd.path, pcd.fd);
		mProfiler.autoStopProfiler = false;
		@@ -3772,9 +3769,6 @@ public final class ActivityThread {
		}
		} else {
		switch (profileType) {
		case 1:
		ViewDebug.stopLooperProfiling();
		break;
		default:
		mProfiler.stopProfiling();
		break;

core/java/android/os/Looper.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -127,29 +127,17 @@ public class Looper {
		return;
		}

		long wallStart = 0;
		long threadStart = 0;

		// This must be in a local variable, in case a UI event sets the logger
		Printer logging = me.mLogging;
		if (logging != null) {
		logging.println(">>>>> Dispatching to " + msg.target + " " +
		msg.callback + ": " + msg.what);
		wallStart = SystemClock.currentTimeMicro();
		threadStart = SystemClock.currentThreadTimeMicro();
		}

		msg.target.dispatchMessage(msg);

		if (logging != null) {
		long wallTime = SystemClock.currentTimeMicro() - wallStart;
		long threadTime = SystemClock.currentThreadTimeMicro() - threadStart;

		logging.println("<<<<< Finished to " + msg.target + " " + msg.callback);
		if (logging instanceof Profiler) {
		((Profiler) logging).profile(msg, wallStart, wallTime,
		threadStart, threadTime);
		}
		}

		// Make sure that during the course of dispatching the
		@@ -290,12 +278,4 @@ public class Looper {
		public String toString() {
		return "Looper{" + Integer.toHexString(System.identityHashCode(this)) + "}";
		}

		/**
		* @hide
		*/
		public static interface Profiler {
		void profile(Message message, long wallStart, long wallTime,
		long threadStart, long threadTime);
		}
		}