android_frameworks_base

android

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

android_animation_PropertyValuesHolder.cpp

…

android_app_backup_FullBackup.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_app_NativeActivity.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_backup_BackupDataInput.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_backup_BackupDataOutput.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_backup_BackupHelperDispatcher.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_backup_FileBackupHelperBase.cpp

…

android_content_res_Configuration.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_content_res_ObbScanner.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_database_CursorWindow.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_database_SQLiteCommon.cpp

…

android_database_SQLiteCommon.h

…

android_database_SQLiteConnection.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_database_SQLiteDebug.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_database_SQLiteGlobal.cpp

…

android_ddm_DdmHandleNativeHeap.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_emoji_EmojiFactory.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_graphics_Canvas.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_graphics_Picture.cpp

…

android_hardware_camera2_CameraMetadata.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_hardware_camera2_DngCreator.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_hardware_camera2_legacy_LegacyCameraDevice.cpp

Use standard initializers

2014-11-17 23:30:44 +00:00

android_hardware_camera2_legacy_PerfMeasurement.cpp

…

android_hardware_Camera.cpp

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

android_hardware_location_ActivityRecognitionHardware.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_hardware_SensorManager.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_hardware_SerialPort.cpp

…

android_hardware_SoundTrigger.cpp

SoundTrigger JNI: fix local reference leak.

2014-10-29 15:52:43 -07:00

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

…

android_hardware_UsbRequest.cpp

…

android_media_AudioErrors.h

…

android_media_AudioFormat.h

…

android_media_AudioRecord.cpp

AudioRecorder read buffer overflow

2014-11-13 10:15:58 -08:00

android_media_AudioSystem.cpp

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

android_media_AudioTrack.cpp

…

android_media_JetPlayer.cpp

…

android_media_RemoteDisplay.cpp

…

android_media_ToneGenerator.cpp

…

android_net_LocalSocketImpl.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_net_NetUtils.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_net_TrafficStats.cpp

…

android_nfc.h

…

android_nio_utils.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_nio_utils.h

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_opengl_EGL14.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_EGLExt.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES10.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES10Ext.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES11.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES11Ext.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES20.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES30.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES31.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_opengl_GLES31Ext.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

android_os_Debug.cpp

am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

2014-11-20 23:00:56 +00:00

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_os_MessageQueue.h

…

android_os_Parcel.cpp

am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

2014-11-20 23:00:56 +00:00

android_os_Parcel.h

…

android_os_SELinux.cpp

…

android_os_SystemClock.cpp

…

android_os_SystemProperties.cpp

…

android_os_Trace.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_os_UEventObserver.cpp

…

android_server_FingerprintManager.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_server_NetworkManagementSocketTagger.cpp

…

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_StaticLayout.cpp

…

android_util_AssetManager.cpp

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

android_util_Binder.cpp

Merge "Fix clang warnings in core/jni."

2014-11-20 22:58:47 +00:00

android_util_Binder.h

…

android_util_EventLog.cpp

…

android_util_FileObserver.cpp

kill HAVE_INOTIFY

2014-11-10 16:01:10 -08:00

android_util_Log.cpp

…

android_util_Log.h

…

android_util_Process.cpp

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08:00

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08:00

android_view_DisplayEventReceiver.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

android_view_GLES20Canvas.cpp

am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"

2014-11-19 18:26:51 +00:00

android_view_GraphicBuffer.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_GraphicBuffer.h

…

android_view_HardwareLayer.cpp

Fix wrong-thread issue

2014-11-07 10:31:53 -08:00

android_view_InputChannel.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_InputChannel.h

…

android_view_InputDevice.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_InputDevice.h

…

android_view_InputEventReceiver.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_InputEventSender.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_InputQueue.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_KeyCharacterMap.cpp

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08:00

android_view_KeyCharacterMap.h

…

android_view_KeyEvent.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_PointerIcon.h

…

android_view_RenderNode.cpp

am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"

2014-11-19 18:26:51 +00:00

android_view_RenderNodeAnimator.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_Surface.cpp

am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"

2014-11-17 18:24:54 +00:00

android_view_SurfaceControl.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

android_view_SurfaceSession.cpp

…

android_view_TextureView.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

android_view_ThreadedRenderer.cpp

Cleanup DeferredLayerUpdater

2014-10-03 15:02:19 -07:00

android_view_VelocityTracker.cpp

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

Android.mk

Frameworks/base: Ignore unknown pragmas in core/jni

2014-11-18 14:38:00 -08:00

AndroidRuntime.cpp

am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

2014-11-18 22:57:02 +00:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

com_android_internal_net_NetworkStatsFactory.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

com_android_internal_os_Zygote.cpp

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00

com_android_internal_os_ZygoteInit.cpp

…

com_android_internal_util_VirtualRefBasePtr.cpp

…

com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp

…

com_google_android_gles_jni_EGLImpl.cpp

Fix incorrect JNI_ABORT

2014-10-06 12:44:09 -07:00

com_google_android_gles_jni_GLImpl.cpp

Frameworks/base: New GL bindings

2014-11-12 14:12:45 -08:00

core_jni_helpers.h

Frameworks/base: Replace LOG_FATAL_IF in core/jni

2014-11-19 09:21:12 -08:00

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…