summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-16 17:26:15 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-16 17:26:15 -0400
commit7bb7e99216956d917af1786a3e02a92cac46fc84 (patch)
treea18f9ff4056dad827b45b774b27d4a5f5d9c5027 /libs
parent7f66dbcec37bdb154db0e7c95c73ecd257bc38c9 (diff)
parenta8ac904d97a008b346390c87e74d44df39b0f320 (diff)
downloadframeworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.zip
frameworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.tar.gz
frameworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.tar.bz2
Merge change Ia8ac904d into eclair
* changes: fix [2182249] [MR1] valgrind error in surface flinger
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/tests/region.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/ui/tests/region.cpp b/libs/ui/tests/region.cpp
index 0deb2ba..ef15de9 100644
--- a/libs/ui/tests/region.cpp
+++ b/libs/ui/tests/region.cpp
@@ -25,9 +25,16 @@ using namespace android;
int main()
{
+ Region empty;
Region reg0( Rect( 0, 0, 100, 100 ) );
Region reg1 = reg0;
Region reg2, reg3;
+
+ Region reg4 = empty | reg1;
+ Region reg5 = reg1 | empty;
+
+ reg4.dump("reg4");
+ reg5.dump("reg5");
reg0.dump("reg0");
reg1.dump("reg1");