commit 018107a82d80f186d3efca250e38e9c85436a4d9
author Zhijun He <zhijunhe@google.com> Mon Jan 18 15:32:50 2016 -0800
committer Zhijun He <zhijunhe@google.com> Sat Jan 23 16:26:47 2016 -0800
tree cad8e46d1d824328bdd8dfbace742397a21da310
parent 97385561584e96c1c1149cf883e0ad1c75cfbdd0

camera: Add surface set ID to OutputConfiguration

Bug: 25088440
Change-Id: I95153522b8b1f3ec4c98800b94a95fe7782c9205

include/camera/camera2/OutputConfiguration.h

diff --git a/include/camera/camera2/OutputConfiguration.h b/include/camera/camera2/OutputConfiguration.h
index 5bcbe15..d6b74a9 100644
--- a/include/camera/camera2/OutputConfiguration.h
+++ b/include/camera/camera2/OutputConfiguration.h
@@ -28,8 +28,10 @@
 public:
 
     static const int INVALID_ROTATION;
+    static const int INVALID_SET_ID;
     sp<IGraphicBufferProducer> getGraphicBufferProducer() const;
     int                        getRotation() const;
+    int                        getSurfaceSetID() const;
 
     /**
      * Keep impl up-to-date with OutputConfiguration.java in frameworks/base
@@ -39,12 +41,13 @@
     // getRotation will be INVALID_ROTATION if error occurred
     OutputConfiguration(const Parcel& parcel);
 
-    OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation);
+    OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation,
+            int surfaceSetID = INVALID_SET_ID);
 
 private:
     sp<IGraphicBufferProducer> mGbp;
     int                        mRotation;
-
+    int                        mSurfaceSetID;
     // helper function
     static String16 readMaybeEmptyString16(const Parcel& parcel);
 };