summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-12-14 21:23:20 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-12-14 21:23:20 +0000
commitab8ff75e2edb3120da2f9d7f244ade65d5ccb27b (patch)
treeeb1605a885f4dc38063ddb77a478fdd8507a6255
parent1e36223ffcc93b39407cc719d876b8135826c91f (diff)
parent8a24eccef6c3680c0d45d91f33de03a0e15caaed (diff)
downloadeasel-oreo-mr1-release.tar.gz
Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testing
Change-Id: I4f0052da83a42e5fe00136befc6deeb40a90e4ad
-rw-r--r--camera/libhdrplusclient/include/HdrPlusClient.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/camera/libhdrplusclient/include/HdrPlusClient.h b/camera/libhdrplusclient/include/HdrPlusClient.h
index 40905cc..31f7124 100644
--- a/camera/libhdrplusclient/include/HdrPlusClient.h
+++ b/camera/libhdrplusclient/include/HdrPlusClient.h
@@ -143,6 +143,12 @@ public:
virtual void notifyFrameMetadata(uint32_t frameNumber, const camera_metadata_t &resultMetadata,
bool lastMetadata=true) = 0;
+ /*
+ * Notify Easel has encountered a fatal error and HDR+ client should stop sending messages
+ * to Easel.
+ */
+ virtual void nofityEaselFatalError() = 0;
+
private:
// Disallow copy and assign.
HdrPlusClient(const HdrPlusClient&) = delete;