Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Debug: Remove obsolete InstructionCount code." am: f5a8edeaf0

Browse Source 
am: 47659c3351

Change-Id: I1d4b929ead3af4ef3f9d28de2a3e905d124e718c
This commit is contained in:
Narayan Kamath
2017-11-01 20:56:50 +00:00
committed by android-build-merger
parent 7dc51259cd 47659c3351
commit 39343bf215
1 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
core/java/android/os/Debug.java
View File

@@ -23,7 +23,6 @@ import android.util.Log;
import com.android.internal.util.FastPrintWriter;
import com.android.internal.util.TypedProperties;
import dalvik.bytecode.OpcodeInfo;
import dalvik.system.VMDebug;
import org.apache.harmony.dalvik.ddmc.Chunk;
@@ -48,8 +47,6 @@ import java.util.HashMap;
import java.util.Map;
/**
* Provides various debugging methods for Android applications, including
* tracing and allocation counts.
@@ -1959,13 +1956,7 @@ public final class Debug
*/
@Deprecated
public static class InstructionCount {
private static final int NUM_INSTR =
OpcodeInfo.MAXIMUM_PACKED_VALUE + 1;
private int[] mCounts;
public InstructionCount() {
mCounts = new int[NUM_INSTR];
}
/**
@@ -1975,13 +1966,7 @@ public final class Debug
* @return true if counting was started
*/
public boolean resetAndStart() {
try {
VMDebug.startInstructionCounting();
VMDebug.resetInstructionCount();
} catch (UnsupportedOperationException uoe) {
return false;
}
return true;
return false;
}
/**
@@ -1989,13 +1974,7 @@ public final class Debug
* counting process.
*/
public boolean collect() {
try {
VMDebug.stopInstructionCounting();
VMDebug.getInstructionCount(mCounts);
} catch (UnsupportedOperationException uoe) {
return false;
}
return true;
return false;
}
/**
@@ -2003,13 +1982,7 @@ public final class Debug
* all threads).
*/
public int globalTotal() {
int count = 0;
for (int i = 0; i < NUM_INSTR; i++) {
count += mCounts[i];
}
return count;
return 0;
}
/**
@@ -2017,15 +1990,7 @@ public final class Debug
* executed globally.
*/
public int globalMethodInvocations() {
int count = 0;
for (int i = 0; i < NUM_INSTR; i++) {
if (OpcodeInfo.isInvoke(i)) {
count += mCounts[i];
}
}
return count;
return 0;
}
}