LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ApiDemos: Fix array indexing bug in game controller demo.

Browse Source 
Change-Id: Ic7f1ce8bed39b2c10dd0e583c3ad118095f14752
This commit is contained in:
Jeff Brown
2011-06-30 12:01:10 -07:00
parent d9344bb5fd
commit f53e7c9863
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/ApiDemos/src/com/example/android/apis/view/GameControllerInput.java
View File

@@ -41,6 +41,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@@ -155,7 +156,8 @@ public class GameControllerInput extends Activity {
mDevice = device; mDevice = device;
int numAxes = 0; int numAxes = 0;
for (MotionRange range : device.getMotionRanges()) { final List<MotionRange> ranges = device.getMotionRanges();
for (MotionRange range : ranges) {
if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
numAxes += 1; numAxes += 1;
} }
@@ -164,11 +166,10 @@ public class GameControllerInput extends Activity {
mAxes = new int[numAxes]; mAxes = new int[numAxes];
mAxisValues = new float[numAxes]; mAxisValues = new float[numAxes];
int i = 0; int i = 0;
for (MotionRange range : device.getMotionRanges()) { for (MotionRange range : ranges) {
if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
numAxes += 1; mAxes[i++] = range.getAxis();
} }
mAxes[i++] = range.getAxis();
} }
mKeys = new SparseIntArray(); mKeys = new SparseIntArray();