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

Commit 4a4a2a67 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" 

* commit '044f323e':
  Frameworks/base: Fix AssetManager JNI
parents bc0636e5 044f323e

core/jni/android_util_AssetManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ static JNINativeMethod gAssetManagerMethods[] = { 
    { "getAssetAllocations", "()Ljava/lang/String;",

        (void*) android_content_AssetManager_getAssetAllocations },

    { "getGlobalAssetManagerCount", "()I",

        (void*) android_content_AssetManager_getGlobalAssetCount },

        (void*) android_content_AssetManager_getGlobalAssetManagerCount },

};



int register_android_content_AssetManager(JNIEnv* env)