diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-03 00:29:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-03 00:29:04 +0000 |
| commit | fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 (patch) | |
| tree | 8c35d32339aef06d77648a8fa7961d058e8356f9 /include | |
| parent | 6c516d800d97b7f25a22574998cb055c9d7f7b16 (diff) | |
| parent | 6770260f83f5576b041b7b3a2536d082a631f9b0 (diff) | |
| download | frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.zip frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.gz frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.bz2 | |
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/VendorTagDescriptor.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/camera/VendorTagDescriptor.h b/include/camera/VendorTagDescriptor.h index 1758acf..ea21d31 100644 --- a/include/camera/VendorTagDescriptor.h +++ b/include/camera/VendorTagDescriptor.h @@ -16,7 +16,6 @@ #ifndef VENDOR_TAG_DESCRIPTOR_H -#include <utils/Vector.h> #include <utils/KeyedVector.h> #include <utils/String8.h> #include <utils/RefBase.h> @@ -68,24 +67,6 @@ class VendorTagDescriptor /*out*/ Parcel* parcel) const; - /** - * Convenience method to get a vector containing all vendor tag - * sections, or an empty vector if none are defined. - */ - SortedVector<String8> getAllSectionNames() const; - - /** - * Lookup the tag id for a given tag name and section. - * - * Returns OK on success, or a negative error code. - */ - status_t lookupTag(String8 name, String8 section, /*out*/uint32_t* tag) const; - - /** - * Dump the currently configured vendor tags to a file descriptor. - */ - void dump(int fd, int verbosity, int indentation) const; - // Static methods: /** @@ -128,11 +109,9 @@ class VendorTagDescriptor static sp<VendorTagDescriptor> getGlobalVendorTagDescriptor(); protected: VendorTagDescriptor(); - KeyedVector<String8, KeyedVector<String8, uint32_t>*> mReverseMapping; KeyedVector<uint32_t, String8> mTagToNameMap; - KeyedVector<uint32_t, uint32_t> mTagToSectionMap; // Value is offset in mSections + KeyedVector<uint32_t, String8> mTagToSectionMap; KeyedVector<uint32_t, int32_t> mTagToTypeMap; - SortedVector<String8> mSections; // must be int32_t to be compatible with Parcel::writeInt32 int32_t mTagCount; private: |