Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1

Android 5.1.0 release 1

1 files changed, 3 insertions, 1 deletions

diff --git a/rsAllocation.h b/rsAllocation.h
index f197efc1..065d7be1 100644
--- a/rsAllocation.h
+++ b/rsAllocation.h
@@ -88,6 +88,8 @@ public:
                 uint32_t shift;
                 uint32_t step;
             } yuv;
+
+            int grallocFlags;
         };
         mutable DrvState drvState;
 
@@ -183,7 +185,7 @@ protected:
         const android::renderscript::Context *rsc;
         const android::renderscript::Allocation *alloc;
 
-        virtual void onFrameAvailable();
+        virtual void onFrameAvailable(const BufferItem& item);
     };
 
     sp<NewBufferListener> mBufferListener;