diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2018-02-12 14:27:46 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2018-02-28 19:06:48 -0800 |
| commit | bebfcc46a249a70af04bc18490a897888a142fb8 (patch) | |
| tree | 18f0c31f70495b104ba81a8f340a2c03bbd57d75 /core/jni/include | |
| parent | 0e35073ec9d02677f189e96b734d87d9dba650bd (diff) | |
Refactor AssetManager
Bug: 64071469
Test: atest CtsContentTestCases
Change-Id: Ia6856157e8813856268fba003e1e591d690cb26e
Diffstat (limited to 'core/jni/include')
| -rw-r--r-- | core/jni/include/android_runtime/android_util_AssetManager.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/jni/include/android_runtime/android_util_AssetManager.h b/core/jni/include/android_runtime/android_util_AssetManager.h index 8dd933707a6a..2c1e3579eb92 100644 --- a/core/jni/include/android_runtime/android_util_AssetManager.h +++ b/core/jni/include/android_runtime/android_util_AssetManager.h @@ -14,17 +14,20 @@ * limitations under the License. */ -#ifndef android_util_AssetManager_H -#define android_util_AssetManager_H +#ifndef ANDROID_RUNTIME_ASSETMANAGER_H +#define ANDROID_RUNTIME_ASSETMANAGER_H -#include <androidfw/AssetManager.h> +#include "androidfw/AssetManager2.h" +#include "androidfw/MutexGuard.h" #include "jni.h" namespace android { -extern AssetManager* assetManagerForJavaObject(JNIEnv* env, jobject assetMgr); +extern AAssetManager* NdkAssetManagerForJavaObject(JNIEnv* env, jobject jassetmanager); +extern Guarded<AssetManager2>* AssetManagerForJavaObject(JNIEnv* env, jobject jassetmanager); +extern Guarded<AssetManager2>* AssetManagerForNdkAssetManager(AAssetManager* assetmanager); -} +} // namespace android -#endif +#endif // ANDROID_RUNTIME_ASSETMANAGER_H |