Adding android.os.Debug.countInstancesOfClass

- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888

1 files changed, 2 insertions, 3 deletions

diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 727cf17e9dfd..11e68c585ea3 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -27,7 +27,6 @@ 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;
@@ -431,7 +430,7 @@ public class ViewDebug {
      * @hide
      */
     public static long getViewInstanceCount() {
-        return VMDebug.countInstancesOfClass(View.class);
+        return Debug.countInstancesOfClass(View.class);
     }
 
     /**
@@ -442,7 +441,7 @@ public class ViewDebug {
      * @hide
      */
     public static long getViewRootInstanceCount() {
-        return VMDebug.countInstancesOfClass(ViewRoot.class);
+        return Debug.countInstancesOfClass(ViewRoot.class);
     }
 
     /**