Dianne Hackborn 6ab84eeb0f am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread ...

Merge commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e'

* commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e':
  Fix issue #3126018: No way to specify NativeActivity's native method

2010-10-24 18:42:12 -07:00

..

android

Merge "Fix 3122139, where previewing an attachment for the second time will fail."

2010-10-22 11:22:59 -07:00

ActivityManager.cpp

…

android_app_NativeActivity.cpp

Fix issue #3126018: No way to specify NativeActivity's native method

2010-10-24 14:56:38 -07:00

android_backup_BackupDataInput.cpp

…

android_backup_BackupDataOutput.cpp

…

android_backup_BackupHelperDispatcher.cpp

…

android_backup_FileBackupHelperBase.cpp

…

android_bluetooth_BluetoothAudioGateway.cpp

…

android_bluetooth_BluetoothSocket.cpp

…

android_bluetooth_common.cpp

…

android_bluetooth_common.h

…

android_bluetooth_HeadsetBase.cpp

…

android_content_res_Configuration.cpp

…

android_content_res_ObbScanner.cpp

OBB: use PBKDF2 for key generation.

2010-10-13 18:25:33 -07:00

android_database_CursorWindow.cpp

…

android_database_SQLiteCompiledSql.cpp

…

android_database_SQLiteDatabase.cpp

don't print informational messages from sqlite in log

2010-10-04 18:10:51 -07:00

android_database_SQLiteDebug.cpp

…

android_database_SQLiteProgram.cpp

…

android_database_SQLiteQuery.cpp

fix bugs in exception throwing code in native_fillwindow

2010-09-14 16:38:01 -07:00

android_database_SQLiteStatement.cpp

don't compile statement for certain SQL statements

2010-09-17 10:15:40 -07:00

android_ddm_DdmHandleNativeHeap.cpp

…

android_debug_JNITest.cpp

…

android_emoji_EmojiFactory.cpp

…

android_graphics_PixelFormat.cpp

…

android_hardware_Camera.cpp

Fix the runtime restart due to name change.

2010-09-15 16:08:57 -07:00

android_hardware_SensorManager.cpp

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

android_media_AudioRecord.cpp

…

android_media_AudioSystem.cpp

Fix issue 3098880.

2010-10-15 12:33:16 -07:00

android_media_AudioTrack.cpp

fix problem in AudioEffect JNI setup.

2010-09-24 13:18:14 -07:00

android_media_JetPlayer.cpp

…

android_media_ToneGenerator.cpp

…

android_message_digest_sha1.cpp

…

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

…

android_net_TrafficStats.cpp

…

android_net_wifi_Wifi.cpp

Add Wifi Protected Setup support

2010-09-23 09:13:34 -07:00

android_nfc_NdefMessage.cpp

Attempt to fix simulator build.

2010-10-22 08:48:48 -07:00

android_nfc_NdefRecord.cpp

Attempt to fix simulator build.

2010-10-22 08:48:48 -07:00

android_nfc.h

NFC: Move NFC service implementation out of system_server.

2010-10-17 18:35:29 -07:00

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_GLES10.cpp

…

android_opengl_GLES10Ext.cpp

…

android_opengl_GLES11.cpp

…

android_opengl_GLES11Ext.cpp

…

android_opengl_GLES20.cpp

…

android_os_Debug.cpp

Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents

2010-10-17 23:40:43 -07:00

android_os_FileUtils.cpp

…

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

Switch Looper back to using poll() instead of epoll().

2010-10-07 13:26:39 -07:00

android_os_MessageQueue.h

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

android_os_ParcelFileDescriptor.cpp

Backport ParcelFileDescriptor.createPipe() from master.

2010-10-21 22:39:41 -05:00

android_os_Power.cpp

…

android_os_StatFs.cpp

…

android_os_SystemClock.cpp

…

android_os_SystemProperties.cpp

…

android_os_UEventObserver.cpp

…

android_pim_EventRecurrence.cpp

…

android_security_Md5MessageDigest.cpp

…

android_server_BluetoothA2dpService.cpp

…

android_server_BluetoothEventLoop.cpp

Rework Bluetooth tethering networking configuration.

2010-09-14 15:25:14 -07:00

android_server_BluetoothService.cpp

resolved conflicts for merge of 0522f5e9 to master

2010-09-13 14:57:59 -07:00

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

jni: Remove duplicated jniThrowException()

2010-10-17 21:08:53 +08:00

android_text_AndroidCharacter.cpp

jni: Remove duplicated jniThrowException()

2010-10-17 21:08:53 +08:00

android_text_format_Time.cpp

…

android_text_KeyCharacterMap.cpp

…

android_util_AssetManager.cpp

…

android_util_Binder.cpp

…

android_util_Binder.h

…

android_util_EventLog.cpp

…

android_util_FileObserver.cpp

…

android_util_FloatMath.cpp

…

android_util_Log.cpp

…

android_util_Process.cpp

Add system property to turn off scheduling groups.

2010-09-07 11:19:11 -07:00

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

…

android_view_Display.cpp

…

android_view_GLES20Canvas.cpp

Optimizing display lists by referencing pointers to resources instead of copying them

2010-10-21 12:02:42 -07:00

android_view_InputChannel.cpp

…

android_view_InputChannel.h

…

android_view_InputQueue.cpp

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

android_view_KeyEvent.cpp

…

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

Add MotionEvent Matrix transformations.

2010-09-30 11:52:48 -07:00

android_view_MotionEvent.h

…

android_view_Surface.cpp

…

android_view_ViewRoot.cpp

…

Android.mk

NFC: Move NFC service implementation out of system_server.

2010-10-17 18:35:29 -07:00

AndroidRuntime.cpp

NFC: Move NFC service implementation out of system_server.

2010-10-17 18:35:29 -07:00

BindTest.cpp

…

com_android_internal_graphics_NativeUtils.cpp

…

com_android_internal_os_ZygoteInit.cpp

…

com_google_android_gles_jni_EGLImpl.cpp

…

com_google_android_gles_jni_GLImpl.cpp

…

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

sqlite3_exception.h

…

Time.cpp

…

TimeUtils.h

…