Dalvik opcode-related fixes.

This makes Debug not hard code the number of opcodes and includes an
api-update of other opcode-related changes done in dalvik.system.

Change-Id: I70d22e1c710f224d75a22e319916724aea53f78d

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index d21b5c02ac2f..c56c6d4f3faf 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -40,6 +40,7 @@ import org.apache.harmony.dalvik.ddmc.Chunk;
 import org.apache.harmony.dalvik.ddmc.ChunkHandler;
 import org.apache.harmony.dalvik.ddmc.DdmServer;
 
+import dalvik.bytecode.OpcodeInfo;
 import dalvik.bytecode.Opcodes;
 import dalvik.system.VMDebug;
 
@@ -865,7 +866,7 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo
      * </pre>
      */
     public static class InstructionCount {
-        private static final int NUM_INSTR = 256;
+        private static final int NUM_INSTR = OpcodeInfo.MAXIMUM_VALUE + 1;
 
         private int[] mCounts;