summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-12-06 17:25:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-06 17:25:44 -0800
commit8da8fc1f3662befd044fb2a92765c789f88aa45d (patch)
treebafc560b57ace6cc6fd0988a38058418047d8a7a
parent99108e71925d7a9df0295ad37ab89449d52cb580 (diff)
parentb96f58911e412fdb0ebdd2bda7dbe89a0829b5db (diff)
downloadframeworks_base-8da8fc1f3662befd044fb2a92765c789f88aa45d.zip
frameworks_base-8da8fc1f3662befd044fb2a92765c789f88aa45d.tar.gz
frameworks_base-8da8fc1f3662befd044fb2a92765c789f88aa45d.tar.bz2
Merge "Propagate the concept of "packed opcode" values."
-rw-r--r--core/java/android/os/Debug.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 9c3bc9d..8d9867e 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -866,7 +866,8 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo
* </pre>
*/
public static class InstructionCount {
- private static final int NUM_INSTR = OpcodeInfo.MAXIMUM_VALUE + 1;
+ private static final int NUM_INSTR =
+ OpcodeInfo.MAXIMUM_PACKED_VALUE + 1;
private int[] mCounts;