commit 531b4e9da69a531b50c6ac5de4d92779c7aae3dd
author Narayan Kamath <narayan@google.com> Tue May 06 15:38:51 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 06 15:38:52 2014 +0000
tree 1cca3117a3f1edeca789a05725cd63448147c281
parent 295b205197c74308ddfc928c3b90124ed42e25bf
parent d21e9f32fe584a812ff19549b96f69b0b9c3a8a8

Merge "audio_quality: Fix for 64-bit compatibility"

suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp

diff --git a/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp b/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
index 9076f39..ea166a1 100644
--- a/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
+++ b/suite/cts/deviceTests/opengl/jni/graphics/GLUtils.cpp
@@ -77,7 +77,8 @@
 }
 
 static int readInt(char* b) {
-    return (((int) b[0]) << 24) | (((int) b[1]) << 16) | (((int) b[2]) << 8) | ((int) b[3]);
+    unsigned char* ub = (unsigned char*) b;
+    return (((int) ub[0]) << 24) | (((int) ub[1]) << 16) | (((int) ub[2]) << 8) | ((int) ub[3]);
 }
 
 static float readFloat(char* b) {

tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java

diff --git a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
old mode 100644
new mode 100755
index 072988d..afe664f
--- a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
@@ -33,9 +33,9 @@
 
     @Override
     public void onPause() {
-        mWatchDog.stop();
         super.onPause();
         setRenderMode(RENDERMODE_WHEN_DIRTY);
+        mWatchDog.stop();
     }
 
     @Override