summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2011-11-02 20:58:26 -0700
committerThe Android Automerger <android-build@android.com>2011-11-02 20:58:26 -0700
commit54b212c75e17ffb963b1266c31f1908a1a70ca71 (patch)
tree0c16341496500e8012c71b3163f49a8509b6371d
parent50b193c82d0458a1c225f3042f84618fe3408482 (diff)
downloadbase-54b212c75e17ffb963b1266c31f1908a1a70ca71.tar.gz
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
-rw-r--r--libs/rs/rsContext.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 5291a1f73f2e..948ecf90a732 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -359,7 +359,6 @@ Context::Context() {
mTargetSdkVersion = 14;
mDPI = 96;
mIsContextLite = false;
- memset(&watchdog, 0, sizeof(watchdog));
}
Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) {