Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 083b89a4 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 

Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
parents 0d049910 005c212a

include/utils/AssetManager.h

+19 −1
Original line number Diff line number Diff line
@@ -29,6 +29,24 @@ 
#include <utils/ZipFileRO.h>

#include <utils/threads.h>



/*

 * Native-app access is via the opaque typedef struct AAssetManager in the C namespace.

 */

#ifdef __cplusplus

extern "C" {

#endif



struct AAssetManager { };



#ifdef __cplusplus

};

#endif





/*

 * Now the proper C++ android-namespace definitions

 */



namespace android {



class Asset;        // fwd decl for things that include Asset.h first
@@ -48,7 +66,7 @@ struct ResTable_config; 
 * The asset hierarchy may be examined like a filesystem, using

 * AssetDir objects to peruse a single directory.

 */

class AssetManager {

class AssetManager : public AAssetManager {

public:

    typedef enum CacheMode {

        CACHE_UNKNOWN = 0,