diff options
| author | Christopher Tate <ctate@google.com> | 2010-07-15 23:05:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 23:05:27 -0700 |
| commit | 6ba776ad34a8029e4d0c784ce0092f1fcbc91bef (patch) | |
| tree | 8df9196a58f89c0f05b49e3588bc08481a1ee198 /core/java/android | |
| parent | 085d0f55e6a2e8449961174673d43a5868874639 (diff) | |
| parent | 078ccbdbb98c118aa87cab2fef61ff90dd128358 (diff) | |
| download | frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.zip frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.tar.gz frameworks_base-6ba776ad34a8029e4d0c784ce0092f1fcbc91bef.tar.bz2 | |
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
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/NativeActivity.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index ccc9ae3..3238b82 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.AssetManager; import android.graphics.PixelFormat; import android.os.Build; import android.os.Bundle; @@ -52,7 +53,8 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, private boolean mDestroyed; private native int loadNativeCode(String path, MessageQueue queue, - String internalDataPath, String externalDataPath, int sdkVersion); + String internalDataPath, String externalDataPath, int sdkVersion, + AssetManager assetMgr); private native void unloadNativeCode(int handle); private native void onStartNative(int handle); @@ -138,7 +140,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, mNativeHandle = loadNativeCode(path, Looper.myQueue(), getFilesDir().toString(), Environment.getExternalStorageAppFilesDirectory(ai.packageName).toString(), - Build.VERSION.SDK_INT); + Build.VERSION.SDK_INT, getAssets()); if (mNativeHandle == 0) { throw new IllegalArgumentException("Unable to load native library: " + path); diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 1070f08..73d9458 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -70,6 +70,7 @@ public final class AssetManager { // For communication with native code. private int mObject; + private int mNObject; // used by the NDK private StringBlock mStringBlocks[] = null; |