am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" (651807fc) · Commits · e / os / android_frameworks_base

core/java/android/app/NativeActivity.java

+18 −19

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2,
	private NativeContentView mNativeContentView;		private NativeContentView mNativeContentView;
	private InputMethodManager mIMM;		private InputMethodManager mIMM;

	private int mNativeHandle;		private long mNativeHandle;

	private InputQueue mCurInputQueue;		private InputQueue mCurInputQueue;
	private SurfaceHolder mCurSurfaceHolder;		private SurfaceHolder mCurSurfaceHolder;
	@@ -91,27 +91,26 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2,

	private boolean mDestroyed;		private boolean mDestroyed;

	private native int loadNativeCode(String path, String funcname, MessageQueue queue,		private native long loadNativeCode(String path, String funcname, MessageQueue queue,
	String internalDataPath, String obbPath, String externalDataPath, int sdkVersion,		String internalDataPath, String obbPath, String externalDataPath, int sdkVersion,
	AssetManager assetMgr, byte[] savedState);		AssetManager assetMgr, byte[] savedState);
	private native void unloadNativeCode(int handle);		private native void unloadNativeCode(long handle);
			private native void onStartNative(long handle);
	private native void onStartNative(int handle);		private native void onResumeNative(long handle);
	private native void onResumeNative(int handle);		private native byte[] onSaveInstanceStateNative(long handle);
	private native byte[] onSaveInstanceStateNative(int handle);		private native void onPauseNative(long handle);
	private native void onPauseNative(int handle);		private native void onStopNative(long handle);
	private native void onStopNative(int handle);		private native void onConfigurationChangedNative(long handle);
	private native void onConfigurationChangedNative(int handle);		private native void onLowMemoryNative(long handle);
	private native void onLowMemoryNative(int handle);		private native void onWindowFocusChangedNative(long handle, boolean focused);
	private native void onWindowFocusChangedNative(int handle, boolean focused);		private native void onSurfaceCreatedNative(long handle, Surface surface);
	private native void onSurfaceCreatedNative(int handle, Surface surface);		private native void onSurfaceChangedNative(long handle, Surface surface,
	private native void onSurfaceChangedNative(int handle, Surface surface,
	int format, int width, int height);		int format, int width, int height);
	private native void onSurfaceRedrawNeededNative(int handle, Surface surface);		private native void onSurfaceRedrawNeededNative(long handle, Surface surface);
	private native void onSurfaceDestroyedNative(int handle);		private native void onSurfaceDestroyedNative(long handle);
	private native void onInputQueueCreatedNative(int handle, int queuePtr);		private native void onInputQueueCreatedNative(long handle, long queuePtr);
	private native void onInputQueueDestroyedNative(int handle, int queuePtr);		private native void onInputQueueDestroyedNative(long handle, long queuePtr);
	private native void onContentRectChangedNative(int handle, int x, int y, int w, int h);		private native void onContentRectChangedNative(long handle, int x, int y, int w, int h);

	static class NativeContentView extends View {		static class NativeContentView extends View {
	NativeActivity mActivity;		NativeActivity mActivity;

core/java/android/app/backup/BackupDataInput.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ import java.io.IOException;
	* }</pre>		* }</pre>
	*/		*/
	public class BackupDataInput {		public class BackupDataInput {
	int mBackupReader;		long mBackupReader;

	private EntityHeader mHeader = new EntityHeader();		private EntityHeader mHeader = new EntityHeader();
	private boolean mHeaderReady;		private boolean mHeaderReady;
	@@ -185,10 +185,10 @@ public class BackupDataInput {
	}		}
	}		}

	private native static int ctor(FileDescriptor fd);		private native static long ctor(FileDescriptor fd);
	private native static void dtor(int mBackupReader);		private native static void dtor(long mBackupReader);

	private native int readNextHeader_native(int mBackupReader, EntityHeader entity);		private native int readNextHeader_native(long mBackupReader, EntityHeader entity);
	private native int readEntityData_native(int mBackupReader, byte[] data, int offset, int size);		private native int readEntityData_native(long mBackupReader, byte[] data, int offset, int size);
	private native int skipEntityData_native(int mBackupReader);		private native int skipEntityData_native(long mBackupReader);
	}		}

core/java/android/app/backup/BackupDataOutput.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -62,7 +62,7 @@ import java.io.IOException;
	* @see BackupAgent		* @see BackupAgent
	*/		*/
	public class BackupDataOutput {		public class BackupDataOutput {
	int mBackupWriter;		long mBackupWriter;

	/** @hide */		/** @hide */
	public BackupDataOutput(FileDescriptor fd) {		public BackupDataOutput(FileDescriptor fd) {
	@@ -121,11 +121,11 @@ public class BackupDataOutput {
	}		}
	}		}

	private native static int ctor(FileDescriptor fd);		private native static long ctor(FileDescriptor fd);
	private native static void dtor(int mBackupWriter);		private native static void dtor(long mBackupWriter);

	private native static int writeEntityHeader_native(int mBackupWriter, String key, int dataSize);		private native static int writeEntityHeader_native(long mBackupWriter, String key, int dataSize);
	private native static int writeEntityData_native(int mBackupWriter, byte[] data, int size);		private native static int writeEntityData_native(long mBackupWriter, byte[] data, int size);
	private native static void setKeyPrefix_native(int mBackupWriter, String keyPrefix);		private native static void setKeyPrefix_native(long mBackupWriter, String keyPrefix);
	}		}

core/java/android/app/backup/FileBackupHelperBase.java

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import java.io.FileDescriptor;
	class FileBackupHelperBase {		class FileBackupHelperBase {
	private static final String TAG = "FileBackupHelperBase";		private static final String TAG = "FileBackupHelperBase";

	int mPtr;		long mPtr;
	Context mContext;		Context mContext;
	boolean mExceptionLogged;		boolean mExceptionLogged;

	@@ -115,14 +115,13 @@ class FileBackupHelperBase {
	return false;		return false;
	}		}

	private static native int ctor();		private static native long ctor();
	private static native void dtor(int ptr);		private static native void dtor(long ptr);

	native private static int performBackup_native(FileDescriptor oldState,		native private static int performBackup_native(FileDescriptor oldState,
	int data, FileDescriptor newState, String[] files, String[] keys);		long data, FileDescriptor newState, String[] files, String[] keys);
			private static native int writeFile_native(long ptr, String filename, long backupReader);
	private static native int writeFile_native(int ptr, String filename, int backupReader);		private static native int writeSnapshot_native(long ptr, FileDescriptor fd);
	private static native int writeSnapshot_native(int ptr, FileDescriptor fd);
	}		}

core/jni/android_app_NativeActivity.cpp

+36 −36

Original line number	Original line	Diff line number	Diff line
	@@ -241,10 +241,10 @@ static int mainWorkCallback(int fd, int events, void* data) {

	// ------------------------------------------------------------------------		// ------------------------------------------------------------------------

	static jint		static jlong
	loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName,		loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName,
	jobject messageQueue, jstring internalDataDir, jstring obbDir,		jobject messageQueue, jstring internalDataDir, jstring obbDir,
	jstring externalDataDir, int sdkVersion,		jstring externalDataDir, jint sdkVersion,
	jobject jAssetMgr, jbyteArray savedState)		jobject jAssetMgr, jbyteArray savedState)
	{		{
	LOG_TRACE("loadNativeCode_native");		LOG_TRACE("loadNativeCode_native");
	@@ -338,11 +338,11 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName
	}		}
	}		}

	return (jint)code;		return (jlong)code;
	}		}

	static void		static void
	unloadNativeCode_native(JNIEnv* env, jobject clazz, jint handle)		unloadNativeCode_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("unloadNativeCode_native");		LOG_TRACE("unloadNativeCode_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -352,7 +352,7 @@ unloadNativeCode_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onStart_native(JNIEnv* env, jobject clazz, jint handle)		onStart_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onStart_native");		LOG_TRACE("onStart_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -364,7 +364,7 @@ onStart_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onResume_native(JNIEnv* env, jobject clazz, jint handle)		onResume_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onResume_native");		LOG_TRACE("onResume_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -376,7 +376,7 @@ onResume_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static jbyteArray		static jbyteArray
	onSaveInstanceState_native(JNIEnv* env, jobject clazz, jint handle)		onSaveInstanceState_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onSaveInstanceState_native");		LOG_TRACE("onSaveInstanceState_native");

	@@ -403,7 +403,7 @@ onSaveInstanceState_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onPause_native(JNIEnv* env, jobject clazz, jint handle)		onPause_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onPause_native");		LOG_TRACE("onPause_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -415,7 +415,7 @@ onPause_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onStop_native(JNIEnv* env, jobject clazz, jint handle)		onStop_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onStop_native");		LOG_TRACE("onStop_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -427,7 +427,7 @@ onStop_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onConfigurationChanged_native(JNIEnv* env, jobject clazz, jint handle)		onConfigurationChanged_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onConfigurationChanged_native");		LOG_TRACE("onConfigurationChanged_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -439,7 +439,7 @@ onConfigurationChanged_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onLowMemory_native(JNIEnv* env, jobject clazz, jint handle)		onLowMemory_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onLowMemory_native");		LOG_TRACE("onLowMemory_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -451,7 +451,7 @@ onLowMemory_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onWindowFocusChanged_native(JNIEnv* env, jobject clazz, jint handle, jboolean focused)		onWindowFocusChanged_native(JNIEnv* env, jobject clazz, jlong handle, jboolean focused)
	{		{
	LOG_TRACE("onWindowFocusChanged_native");		LOG_TRACE("onWindowFocusChanged_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -463,7 +463,7 @@ onWindowFocusChanged_native(JNIEnv* env, jobject clazz, jint handle, jboolean fo
	}		}

	static void		static void
	onSurfaceCreated_native(JNIEnv* env, jobject clazz, jint handle, jobject surface)		onSurfaceCreated_native(JNIEnv* env, jobject clazz, jlong handle, jobject surface)
	{		{
	LOG_TRACE("onSurfaceCreated_native");		LOG_TRACE("onSurfaceCreated_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -483,7 +483,7 @@ static int32_t getWindowProp(ANativeWindow* window, int what) {
	}		}

	static void		static void
	onSurfaceChanged_native(JNIEnv* env, jobject clazz, jint handle, jobject surface,		onSurfaceChanged_native(JNIEnv* env, jobject clazz, jlong handle, jobject surface,
	jint format, jint width, jint height)		jint format, jint width, jint height)
	{		{
	LOG_TRACE("onSurfaceChanged_native");		LOG_TRACE("onSurfaceChanged_native");
	@@ -524,7 +524,7 @@ onSurfaceChanged_native(JNIEnv* env, jobject clazz, jint handle, jobject surface
	}		}

	static void		static void
	onSurfaceRedrawNeeded_native(JNIEnv* env, jobject clazz, jint handle)		onSurfaceRedrawNeeded_native(JNIEnv* env, jobject clazz, jlong handle)
	{		{
	LOG_TRACE("onSurfaceRedrawNeeded_native");		LOG_TRACE("onSurfaceRedrawNeeded_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -536,7 +536,7 @@ onSurfaceRedrawNeeded_native(JNIEnv* env, jobject clazz, jint handle)
	}		}

	static void		static void
	onSurfaceDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jobject surface)		onSurfaceDestroyed_native(JNIEnv* env, jobject clazz, jlong handle, jobject surface)
	{		{
	LOG_TRACE("onSurfaceDestroyed_native");		LOG_TRACE("onSurfaceDestroyed_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -550,7 +550,7 @@ onSurfaceDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jobject surfa
	}		}

	static void		static void
	onInputQueueCreated_native(JNIEnv* env, jobject clazz, jint handle, jint queuePtr)		onInputQueueCreated_native(JNIEnv* env, jobject clazz, jlong handle, jlong queuePtr)
	{		{
	LOG_TRACE("onInputChannelCreated_native");		LOG_TRACE("onInputChannelCreated_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -563,7 +563,7 @@ onInputQueueCreated_native(JNIEnv* env, jobject clazz, jint handle, jint queuePt
	}		}

	static void		static void
	onInputQueueDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jint queuePtr)		onInputQueueDestroyed_native(JNIEnv* env, jobject clazz, jlong handle, jlong queuePtr)
	{		{
	LOG_TRACE("onInputChannelDestroyed_native");		LOG_TRACE("onInputChannelDestroyed_native");
	if (handle != 0) {		if (handle != 0) {
	@@ -576,7 +576,7 @@ onInputQueueDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jint queue
	}		}

	static void		static void
	onContentRectChanged_native(JNIEnv* env, jobject clazz, jint handle,		onContentRectChanged_native(JNIEnv* env, jobject clazz, jlong handle,
	jint x, jint y, jint w, jint h)		jint x, jint y, jint w, jint h)
	{		{
	LOG_TRACE("onContentRectChanged_native");		LOG_TRACE("onContentRectChanged_native");
	@@ -594,26 +594,26 @@ onContentRectChanged_native(JNIEnv* env, jobject clazz, jint handle,
	}		}

	static const JNINativeMethod g_methods[] = {		static const JNINativeMethod g_methods[] = {
	{ "loadNativeCode", "(Ljava/lang/String;Ljava/lang/String;Landroid/os/MessageQueue;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILandroid/content/res/AssetManager;[B)I",		{ "loadNativeCode", "(Ljava/lang/String;Ljava/lang/String;Landroid/os/MessageQueue;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILandroid/content/res/AssetManager;[B)J",
	(void*)loadNativeCode_native },		(void*)loadNativeCode_native },
	{ "unloadNativeCode", "(I)V", (void*)unloadNativeCode_native },		{ "unloadNativeCode", "(J)V", (void*)unloadNativeCode_native },
	{ "onStartNative", "(I)V", (void*)onStart_native },		{ "onStartNative", "(J)V", (void*)onStart_native },
	{ "onResumeNative", "(I)V", (void*)onResume_native },		{ "onResumeNative", "(J)V", (void*)onResume_native },
	{ "onSaveInstanceStateNative", "(I)[B", (void*)onSaveInstanceState_native },		{ "onSaveInstanceStateNative", "(J)[B", (void*)onSaveInstanceState_native },
	{ "onPauseNative", "(I)V", (void*)onPause_native },		{ "onPauseNative", "(J)V", (void*)onPause_native },
	{ "onStopNative", "(I)V", (void*)onStop_native },		{ "onStopNative", "(J)V", (void*)onStop_native },
	{ "onConfigurationChangedNative", "(I)V", (void*)onConfigurationChanged_native },		{ "onConfigurationChangedNative", "(J)V", (void*)onConfigurationChanged_native },
	{ "onLowMemoryNative", "(I)V", (void*)onLowMemory_native },		{ "onLowMemoryNative", "(J)V", (void*)onLowMemory_native },
	{ "onWindowFocusChangedNative", "(IZ)V", (void*)onWindowFocusChanged_native },		{ "onWindowFocusChangedNative", "(JZ)V", (void*)onWindowFocusChanged_native },
	{ "onSurfaceCreatedNative", "(ILandroid/view/Surface;)V", (void*)onSurfaceCreated_native },		{ "onSurfaceCreatedNative", "(JLandroid/view/Surface;)V", (void*)onSurfaceCreated_native },
	{ "onSurfaceChangedNative", "(ILandroid/view/Surface;III)V", (void*)onSurfaceChanged_native },		{ "onSurfaceChangedNative", "(JLandroid/view/Surface;III)V", (void*)onSurfaceChanged_native },
	{ "onSurfaceRedrawNeededNative", "(ILandroid/view/Surface;)V", (void*)onSurfaceRedrawNeeded_native },		{ "onSurfaceRedrawNeededNative", "(JLandroid/view/Surface;)V", (void*)onSurfaceRedrawNeeded_native },
	{ "onSurfaceDestroyedNative", "(I)V", (void*)onSurfaceDestroyed_native },		{ "onSurfaceDestroyedNative", "(J)V", (void*)onSurfaceDestroyed_native },
	{ "onInputQueueCreatedNative", "(II)V",		{ "onInputQueueCreatedNative", "(JJ)V",
	(void*)onInputQueueCreated_native },		(void*)onInputQueueCreated_native },
	{ "onInputQueueDestroyedNative", "(II)V",		{ "onInputQueueDestroyedNative", "(JJ)V",
	(void*)onInputQueueDestroyed_native },		(void*)onInputQueueDestroyed_native },
	{ "onContentRectChangedNative", "(IIIII)V", (void*)onContentRectChanged_native },		{ "onContentRectChangedNative", "(JIIII)V", (void*)onContentRectChanged_native },
	};		};

	static const char* const kNativeActivityPathName = "android/app/NativeActivity";		static const char* const kNativeActivityPathName = "android/app/NativeActivity";