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

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

am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset... 

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

Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
parents e52c7690 083b89a4

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,