commit f074f7e101ad23a3d80ffc15c68e66ea1e1466c9
author Amith Yamasani <yamasani@google.com> Mon Dec 12 09:56:26 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 12 09:56:26 2011 -0800
tree 8cef08e323746a2ae01800c70e083ad67d7fcb9a
parent fc829f73a0d1f9be90ed8ff74d2312fe3ba23ece
parent e2c4709019b3ba2f0ef42fd7e03ce40df3c47bc8

Merge "Show the current stream's volume in the volume panel."

include/utils/GenerationCache.h

diff --git a/include/utils/GenerationCache.h b/include/utils/GenerationCache.h
index 83cda86..da85a9a 100644
--- a/include/utils/GenerationCache.h
+++ b/include/utils/GenerationCache.h
@@ -88,11 +88,13 @@
 
     void attachToCache(const sp<Entry<K, V> >& entry);
     void detachFromCache(const sp<Entry<K, V> >& entry);
+
+    const V mNullValue;
 }; // class GenerationCache
 
 template<typename K, typename V>
 GenerationCache<K, V>::GenerationCache(uint32_t maxCapacity): mMaxCapacity(maxCapacity),
-    mListener(NULL) {
+    mListener(NULL), mNullValue(NULL) {
 };
 
 template<typename K, typename V>
@@ -154,7 +156,7 @@
         return entry->value;
     }
 
-    return NULL;
+    return mNullValue;
 }
 
 template<typename K, typename V>

opengl/libs/ETC1/etc1.cpp

diff --git a/opengl/libs/ETC1/etc1.cpp b/opengl/libs/ETC1/etc1.cpp
index 5ed2c3c..97d1085 100644
--- a/opengl/libs/ETC1/etc1.cpp
+++ b/opengl/libs/ETC1/etc1.cpp
@@ -149,13 +149,13 @@
 static
 inline int convert8To4(int b) {
     int c = b & 0xff;
-    return divideBy255(b * 15);
+    return divideBy255(c * 15);
 }
 
 static
 inline int convert8To5(int b) {
     int c = b & 0xff;
-    return divideBy255(b * 31);
+    return divideBy255(c * 31);
 }
 
 static