diff options
author | Mathias Agopian <mathias@google.com> | 2009-07-06 14:16:55 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-07-06 14:16:55 -0700 |
commit | 0f7f88db2771ec6b08df1354f1d85290f93227d5 (patch) | |
tree | 63ed23a46b8a32f1f21c734cd430fc88033dc925 /include | |
parent | af54ab9d889c574b44786e81696e47bdbc9dffd4 (diff) | |
parent | d1d016be5fefc74977b4fe71c0166f7fd5b1172a (diff) | |
download | frameworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.zip frameworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.tar.gz frameworks_native-0f7f88db2771ec6b08df1354f1d85290f93227d5.tar.bz2 |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/Camera.h | 6 | ||||
-rw-r--r-- | include/utils/AssetManager.h | 11 | ||||
-rw-r--r-- | include/utils/ResourceTypes.h | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index 97e0e90..e3544ab 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -76,6 +76,12 @@ enum { CAMERA_MSG_COMPRESSED_IMAGE }; +// camera fatal errors +enum { + CAMERA_ERROR_UKNOWN = 1, + CAMERA_ERROR_SERVER_DIED = 100 +}; + class ICameraService; class ICamera; class Surface; diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h index c11429e..d8994e0 100644 --- a/include/utils/AssetManager.h +++ b/include/utils/AssetManager.h @@ -251,6 +251,9 @@ private: Asset* getResourceTableAsset(); Asset* setResourceTableAsset(Asset* asset); + ResTable* getResourceTable(); + ResTable* setResourceTable(ResTable* res); + bool isUpToDate(); protected: @@ -265,6 +268,7 @@ private: time_t mModWhen; Asset* mResourceTableAsset; + ResTable* mResourceTable; static Mutex gLock; static DefaultKeyedVector<String8, wp<SharedZip> > gOpen; @@ -288,8 +292,11 @@ private: */ ZipFileRO* getZip(const String8& path); - Asset* getZipResourceTable(const String8& path); - Asset* setZipResourceTable(const String8& path, Asset* asset); + Asset* getZipResourceTableAsset(const String8& path); + Asset* setZipResourceTableAsset(const String8& path, Asset* asset); + + ResTable* getZipResourceTable(const String8& path); + ResTable* setZipResourceTable(const String8& path, ResTable* res); // generate path, e.g. "common/en-US-noogle.zip" static String8 getPathName(const char* path); diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 5c41ead..93bca4a 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1441,7 +1441,7 @@ struct ResTable_type * This is the beginning of information about an entry in the resource * table. It holds the reference to the name of this entry, and is * immediately followed by one of: - * * A Res_value structures, if FLAG_COMPLEX is -not- set. + * * A Res_value structure, if FLAG_COMPLEX is -not- set. * * An array of ResTable_map structures, if FLAG_COMPLEX is set. * These supply a set of name/value mappings of data. */ @@ -1580,6 +1580,7 @@ public: bool copyData=false); status_t add(Asset* asset, void* cookie, bool copyData=false); + status_t add(ResTable* src); status_t getError() const; @@ -1843,6 +1844,8 @@ private: status_t parsePackage( const ResTable_package* const pkg, const Header* const header); + void print_value(const Package* pkg, const Res_value& value) const; + mutable Mutex mLock; status_t mError; |