Bring back instances counts to dumpsys meminfo. (a14c8e0c) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -617,8 +617,6 @@ public class Activity extends ContextThemeWrapper
		/** Start of user-defined activity results. */
		public static final int RESULT_FIRST_USER = 1;

		private static long sInstanceCount = 0;

		private static final String WINDOW_HIERARCHY_TAG = "android:viewHierarchyState";
		private static final String FRAGMENTS_TAG = "android:fragments";
		private static final String SAVED_DIALOG_IDS_KEY = "android:savedDialogIds";
		@@ -709,23 +707,6 @@ public class Activity extends ContextThemeWrapper
		private Thread mUiThread;
		final Handler mHandler = new Handler();

		// Used for debug only
		/*
		public Activity() {
		++sInstanceCount;
		}

		@Override
		protected void finalize() throws Throwable {
		super.finalize();
		--sInstanceCount;
		}
		*/

		public static long getInstanceCount() {
		return sInstanceCount;
		}

		/** Return the intent that started this activity. */
		public Intent getIntent() {
		return mIntent;

+3 −2

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import com.android.internal.os.BinderInternal;
		import com.android.internal.os.RuntimeInit;
		import com.android.internal.os.SamplingProfilerIntegration;

		import dalvik.system.VMDebug;
		import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;

		import java.io.File;
		@@ -687,8 +688,8 @@ public final class ActivityThread {
		long dalvikAllocated = dalvikMax - dalvikFree;
		long viewInstanceCount = ViewDebug.getViewInstanceCount();
		long viewRootInstanceCount = ViewDebug.getViewRootInstanceCount();
		long appContextInstanceCount = ContextImpl.getInstanceCount();
		long activityInstanceCount = Activity.getInstanceCount();
		long appContextInstanceCount = VMDebug.countInstancesOfClass(ContextImpl.class);
		long activityInstanceCount = VMDebug.countInstancesOfClass(Activity.class);
		int globalAssetCount = AssetManager.getGlobalAssetCount();
		int globalAssetManagerCount = AssetManager.getGlobalAssetManagerCount();
		int binderLocalObjectCount = Debug.getBinderLocalObjectCount();

+0 −18

Original line number	Diff line number	Diff line
		@@ -214,23 +214,8 @@ class ContextImpl extends Context {
		private File mExternalFilesDir;
		private File mExternalCacheDir;

		private static long sInstanceCount = 0;

		private static final String[] EMPTY_FILE_LIST = {};

		// For debug only
		/*
		@Override
		protected void finalize() throws Throwable {
		super.finalize();
		--sInstanceCount;
		}
		*/

		public static long getInstanceCount() {
		return sInstanceCount;
		}

		@Override
		public AssetManager getAssets() {
		return mResources.getAssets();
		@@ -1510,8 +1495,6 @@ class ContextImpl extends Context {
		}

		ContextImpl() {
		// For debug only
		//++sInstanceCount;
		mOuterContext = this;
		}

		@@ -1522,7 +1505,6 @@ class ContextImpl extends Context {
		* @param context Existing application context.
		*/
		public ContextImpl(ContextImpl context) {
		++sInstanceCount;
		mPackageInfo = context.mPackageInfo;
		mResources = context.mResources;
		mMainThread = context.mMainThread;

+0 −14

Original line number	Diff line number	Diff line
		@@ -1955,9 +1955,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		*/
		private int mTouchSlop;

		// Used for debug only
		static long sInstanceCount = 0;

		/**
		* Simple constructor to use when creating a view from code.
		*
		@@ -1968,8 +1965,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		mContext = context;
		mResources = context != null ? context.getResources() : null;
		mViewFlags = SOUND_EFFECTS_ENABLED \| HAPTIC_FEEDBACK_ENABLED;
		// Used for debug only
		//++sInstanceCount;
		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
		}

		@@ -2286,15 +2281,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		View() {
		}

		// Used for debug only
		/*
		@Override
		protected void finalize() throws Throwable {
		super.finalize();
		--sInstanceCount;
		}
		*/

		/**
		* <p>
		* Initializes the fading edges from a given set of styled attributes. This

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.graphics.Rect;
		import android.os.Environment;
		import android.os.Debug;
		import android.os.RemoteException;
		import dalvik.system.VMDebug;

		import java.io.ByteArrayOutputStream;
		import java.io.File;
		@@ -427,7 +428,7 @@ public class ViewDebug {
		* @hide
		*/
		public static long getViewInstanceCount() {
		return View.sInstanceCount;
		return VMDebug.countInstancesOfClass(View.class);
		}

		/**
		@@ -438,7 +439,7 @@ public class ViewDebug {
		* @hide
		*/
		public static long getViewRootInstanceCount() {
		return ViewRoot.getInstanceCount();
		return VMDebug.countInstancesOfClass(ViewRoot.class);
		}

		/**