Merge "Camera2: Add flush support" into klp-dev

diff --cc camera/camera2/ICameraDeviceUser.cpp
index 73fec72,ae4cf69..1e5822f
--- 1/camera/camera2/ICameraDeviceUser.cpp
--- 2/camera/camera2/ICameraDeviceUser.cpp
+++ b/camera/camera2/ICameraDeviceUser.cpp
@@@ -41,21 -41,9 +41,22 @@@ enum 
      CREATE_DEFAULT_REQUEST,
      GET_CAMERA_INFO,
      WAIT_UNTIL_IDLE,
+     FLUSH
  };
  
 +namespace {
 +    // Read empty strings without printing a false error message.
 +    String16 readMaybeEmptyString16(const Parcel& parcel) {
 +        size_t len;
 +        const char16_t* str = parcel.readString16Inplace(&len);
 +        if (str != NULL) {
 +            return String16(str, len);
 +        } else {
 +            return String16();
 +        }
 +    }
 +};
 +
  class BpCameraDeviceUser : public BpInterface<ICameraDeviceUser>
  {
  public: