commit 9d339c13aaa30ddfd51d0f13f8ab22af05e40ea0
author Ying Wang <wangying@google.com> Mon Jul 19 18:31:45 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 19 18:31:45 2010 -0700
tree 1fed33b340b9f623b5c2417098b01b1003bae36a
parent 47f79bb4c53505ed2eceb5825f29f963f356d8b2
parent bbe72dcda60f8d9ec61d893d23bb202f055ce48a

Merge "Fix build"

core/java/android/provider/ContactsContract.java

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 7df8487..c3ec7a2 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -2113,28 +2113,21 @@
                             Data.DATA_VERSION);
                     for (String key : DATA_KEYS) {
                         final int columnIndex = cursor.getColumnIndexOrThrow(key);
-                        if (cursor.isNull(columnIndex)) {
-                            // don't put anything
-                        } else {
-                            try {
+                        switch (cursor.getType(columnIndex)) {
+                            case Cursor.FIELD_TYPE_NULL:
+                                // don't put anything
+                                break;
+                            case Cursor.FIELD_TYPE_INTEGER:
+                            case Cursor.FIELD_TYPE_FLOAT:
+                            case Cursor.FIELD_TYPE_STRING:
                                 cv.put(key, cursor.getString(columnIndex));
-                            } catch (SQLiteException e) {
+                                break;
+                            case Cursor.FIELD_TYPE_BLOB:
                                 cv.put(key, cursor.getBlob(columnIndex));
-                            }
+                                break;
+                            default:
+                                throw new IllegalStateException("Invalid or unhandled data type");
                         }
-                        // TODO: go back to this version of the code when bug
-                        // http://b/issue?id=2306370 is fixed.
-//                        if (cursor.isNull(columnIndex)) {
-//                            // don't put anything
-//                        } else if (cursor.isLong(columnIndex)) {
-//                            values.put(key, cursor.getLong(columnIndex));
-//                        } else if (cursor.isFloat(columnIndex)) {
-//                            values.put(key, cursor.getFloat(columnIndex));
-//                        } else if (cursor.isString(columnIndex)) {
-//                            values.put(key, cursor.getString(columnIndex));
-//                        } else if (cursor.isBlob(columnIndex)) {
-//                            values.put(key, cursor.getBlob(columnIndex));
-//                        }
                     }
                     contact.addSubValue(ContactsContract.Data.CONTENT_URI, cv);
                 } while (cursor.moveToNext());

opengl/tests/gl_perfapp/jni/gl_code.cpp

diff --git a/opengl/tests/gl_perfapp/jni/gl_code.cpp b/opengl/tests/gl_perfapp/jni/gl_code.cpp
index eafb665..020d848 100644
--- a/opengl/tests/gl_perfapp/jni/gl_code.cpp
+++ b/opengl/tests/gl_perfapp/jni/gl_code.cpp
@@ -384,14 +384,18 @@
     int texCount;
     int extraMath;
     int testSubState;
-    if ( testState < 5 * 2) {
-       texCount = 0; // Only 10 tests for texCout 0
-       extraMath = testState / 2;
-       testSubState = testState % 2;
+    const int extraMathCount = 5;
+    const int texCount0SubTestCount = 2;
+    const int texCountNSubTestCount = 8;
+
+    if ( testState < extraMathCount * texCount0SubTestCount) {
+       texCount = 0; // Only 10 tests for texCount 0
+       extraMath = (testState / texCount0SubTestCount) % extraMathCount;
+       testSubState = testState % texCount0SubTestCount;
     } else {
-       texCount = 1 + (testState - 10) / (5 * 8);
-       extraMath = testState / 8;
-       testSubState = testState % 8;
+       texCount = 1 + (testState - extraMathCount * texCount0SubTestCount) / (extraMathCount * texCountNSubTestCount);
+       extraMath = (testState / texCountNSubTestCount) % extraMathCount;
+       testSubState = testState % texCountNSubTestCount;
     }
     if (texCount >= 3) {
        LOGI("done\n");