commit bd1132249479e52ddd128171da24327358e2191c
author Glenn Kasten <gkasten@google.com> Mon May 14 17:06:48 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 14 17:06:48 2012 -0700
tree a82cb977d87872dc02d6d759ff38c2638f79bda9
parent 9cab4ca1ca74068e50192296badd0ae7a61f3927
parent 542af12d10e5923a6e811c72e2bbe4e7507b6448

Merge "Fix log spam about CPU frequency on one device" into jb-dev

cmds/dumpstate/dumpstate.c

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index dd015c6..880f81f 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -311,6 +311,8 @@
 
     ALOGI("begin\n");
 
+    signal(SIGPIPE, SIG_IGN);
+
     /* set as high priority, and protect from OOM killer */
     setpriority(PRIO_PROCESS, 0, -20);
     FILE *oom_adj = fopen("/proc/self/oom_adj", "w");

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 7dad6b6..c9fcc00 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -28,6 +28,7 @@
 
 int main(int argc, char* const argv[])
 {
+    signal(SIGPIPE, SIG_IGN);
     sp<IServiceManager> sm = defaultServiceManager();
     fflush(stdout);
     if (sm == NULL) {

include/ui/Rect.h

diff --git a/include/ui/Rect.h b/include/ui/Rect.h
index 308da7b..c2c2675 100644
--- a/include/ui/Rect.h
+++ b/include/ui/Rect.h
@@ -65,15 +65,22 @@
     }
 
     // rectangle's width
-    inline int32_t width() const {
+    inline int32_t getWidth() const {
         return right-left;
     }
     
     // rectangle's height
-    inline int32_t height() const {
+    inline int32_t getHeight() const {
         return bottom-top;
     }
 
+    inline Rect getBounds() const {
+        return Rect(right-left, bottom-top);
+    }
+
+    inline int32_t width() const { return getWidth(); }
+    inline int32_t height() const { return getHeight(); }
+
     void setLeftTop(const Point& lt) {
         left = lt.x;
         top  = lt.y;