Merge a bunch of cherry-picked changes from the open-source tree.

2 files changed, 4 insertions, 0 deletions

diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h
index 6c847ff30b..926fddb177 100644
--- a/include/private/ui/RegionHelper.h
+++ b/include/private/ui/RegionHelper.h
@@ -62,6 +62,8 @@ public:
     class region_rasterizer {
         friend class region_operator;
         virtual void operator()(const RECT& rect) = 0;
+    public:
+        virtual ~region_rasterizer() { };
     };
     
     inline region_operator(int op, const region& lhs, const region& rhs) 
diff --git a/libs/audioflinger/AudioBufferProvider.h b/libs/audioflinger/AudioBufferProvider.h
index 1a467c7442..81c5c39599 100644
--- a/libs/audioflinger/AudioBufferProvider.h
+++ b/libs/audioflinger/AudioBufferProvider.h
@@ -36,6 +36,8 @@ public:
         };
         size_t frameCount;
     };
+
+    virtual ~AudioBufferProvider() {}
     
     virtual status_t getNextBuffer(Buffer* buffer) = 0;
     virtual void releaseBuffer(Buffer* buffer) = 0;