android_frameworks_base

android

Merge "Fix text encoding when drawing with drawPosText in software"

2012-01-17 14:54:45 -08:00

ActivityManager.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_animation_PropertyValuesHolder.cpp

…

android_app_backup_FullBackup.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_app_NativeActivity.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_backup_BackupDataInput.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_backup_BackupDataOutput.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_backup_BackupHelperDispatcher.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

2012-01-06 10:07:54 +00:00

android_backup_FileBackupHelperBase.cpp

…

android_bluetooth_BluetoothAudioGateway.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_bluetooth_BluetoothSocket.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_bluetooth_c.c

…

android_bluetooth_c.h

…

android_bluetooth_common.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_bluetooth_common.h

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_bluetooth_HeadsetBase.cpp

Fix build warnings

2012-01-11 07:27:41 -08:00

android_content_res_Configuration.cpp

…

android_content_res_ObbScanner.cpp

…

android_database_CursorWindow.cpp

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

android_database_SQLiteCommon.cpp

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

android_database_SQLiteCommon.h

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

android_database_SQLiteConnection.cpp

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

android_database_SQLiteDebug.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_database_SQLiteGlobal.cpp

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

android_ddm_DdmHandleNativeHeap.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_debug_JNITest.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_emoji_EmojiFactory.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_graphics_PixelFormat.cpp

…

android_hardware_Camera.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_hardware_SensorManager.cpp

BitTube::read now handles EAGAIN

2011-11-29 11:42:59 -08:00

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_hardware_UsbRequest.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_media_AudioRecord.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_media_AudioSystem.cpp

Merge "audio framework: manage stream volume per device"

2012-01-17 17:35:03 -08:00

android_media_AudioTrack.cpp

Use audio_stream_type_t consistently

2012-01-13 10:20:14 -08:00

android_media_JetPlayer.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_media_ToneGenerator.cpp

Use audio_stream_type_t consistently

2012-01-13 10:20:14 -08:00

android_net_LocalSocketImpl.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_net_NetUtils.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_net_TrafficStats.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_net_wifi_Wifi.cpp

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

2012-01-03 22:38:27 +00:00

android_nfc.h

…

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

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

2012-01-06 10:07:54 +00:00

android_os_FileUtils.cpp

…

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

…

android_os_MessageQueue.h

…

android_os_ParcelFileDescriptor.cpp

…

android_os_Power.cpp

…

android_os_StatFs.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_os_SystemClock.cpp

…

android_os_SystemProperties.cpp

…

android_os_UEventObserver.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_server_BluetoothA2dpService.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_server_BluetoothEventLoop.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_server_BluetoothService.cpp

Fix build warnings

2012-01-11 07:27:41 -08:00

android_server_NetworkManagementSocketTagger.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_server_Watchdog.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_format_Time.cpp

…

android_util_AssetManager.cpp

Fix build warnings

2012-01-11 13:40:05 -08:00

android_util_Binder.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_util_Binder.h

…

android_util_EventLog.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_util_FileObserver.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_util_FloatMath.cpp

…

android_util_Log.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_util_Process.cpp

Fix build for SDK on Mac

2012-01-17 08:38:51 -08:00

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

…

android_view_Display.cpp

…

android_view_DisplayEventReceiver.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_view_GLES20Canvas.cpp

Full support for Canvas.drawPosText

2012-01-18 18:00:12 -08:00

android_view_HardwareRenderer.cpp

Initialize egl_cache with an app writeable file

2011-11-10 14:20:10 -08:00

android_view_InputChannel.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_view_InputChannel.h

…

android_view_InputEventReceiver.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_view_KeyCharacterMap.cpp

Eliminate hw.keyboards system properties.

2011-11-15 18:00:10 -08:00

android_view_KeyEvent.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

2012-01-06 10:07:54 +00:00

android_view_PointerIcon.h

…

android_view_Surface.cpp

Fix issue #5614559 : Registering surface error in...

2011-12-03 11:16:49 -08:00

android_view_TextureView.cpp

…

android_view_VelocityTracker.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

2012-01-06 10:07:54 +00:00

Android.mk

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

AndroidRuntime.cpp

Rewrite SQLite database wrappers.

2012-01-12 14:56:18 -08:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

resolved conflicts for merge of e80341c8 to master

2012-01-13 13:39:28 -08:00

com_android_internal_os_ZygoteInit.cpp

…

com_google_android_gles_jni_EGLImpl.cpp

Terminate EGL when an app goes in the background

2011-11-10 16:44:49 -08:00

com_google_android_gles_jni_GLImpl.cpp

…

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

Time.cpp

…

TimeUtils.h

…