drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/core/jni
History
John Reck a75b0ad384 resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp 
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
2014-12-04 13:41:04 -08:00
..
android
am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev
2014-11-25 18:46:04 +00:00
android_animation_PropertyValuesHolder.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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: Consistency in core/jni
2014-11-21 10:15:08 -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: Consistency in core/jni
2014-11-21 10:15:08 -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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_ddm_DdmHandleNativeHeap.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -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: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_graphics_Picture.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_camera2_CameraMetadata.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_camera2_DngCreator.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_camera2_legacy_LegacyCameraDevice.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_camera2_legacy_PerfMeasurement.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_Camera.cpp
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
2014-11-21 10:36:14 -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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_SoundTrigger.cpp
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
2014-11-21 10:36:14 -08:00
android_hardware_UsbDevice.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_UsbDeviceConnection.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_hardware_UsbRequest.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_media_AudioErrors.h
…
android_media_AudioFormat.h
…
android_media_AudioRecord.cpp
am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
2014-11-27 00:01:23 +00:00
android_media_AudioSystem.cpp
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
2014-11-21 10:36:14 -08:00
android_media_AudioTrack.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_media_JetPlayer.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_media_RemoteDisplay.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_media_ToneGenerator.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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
Remove unused variables and functions, don't warn about unused parameters
2014-11-23 22:24:32 +01:00
android_opengl_EGL14.cpp
Frameworks/base: New GL bindings
2014-11-12 14:12:45 -08:00
android_opengl_EGLExt.cpp
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
2014-12-02 00:35:12 +00: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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_os_SystemClock.cpp
We have POSIX clocks.
2014-11-25 15:11:59 -08:00
android_os_SystemProperties.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_os_Trace.cpp
Fix clang warnings in core/jni.
2014-11-20 11:47:00 -08:00
android_os_UEventObserver.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
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
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_text_AndroidBidi.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_text_AndroidCharacter.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_text_StaticLayout.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_AssetManager.cpp
am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
2014-12-02 23:07:43 +00:00
android_util_Binder.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_Binder.h
…
android_util_EventLog.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_FileObserver.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_Log.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_Log.h
…
android_util_Process.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_StringBlock.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_util_XmlBlock.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -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 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
2014-11-21 22:21:02 +00:00
android_view_GraphicBuffer.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_view_GraphicBuffer.h
…
android_view_HardwareLayer.cpp
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
2014-11-21 10:36:14 -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: Consistency in core/jni
2014-11-21 10:15:08 -08:00
android_view_InputEventSender.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -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
resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp
2014-11-21 17:07:17 -08:00
android_view_Surface.cpp
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp
2014-11-21 10:36:14 -08:00
android_view_SurfaceControl.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -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
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp
2014-12-04 13:41:04 -08: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: Consistency in core/jni
2014-11-21 10:15:08 -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: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_android_internal_net_NetworkStatsFactory.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_android_internal_os_Zygote.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_android_internal_os_ZygoteInit.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_android_internal_util_VirtualRefBasePtr.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
Frameworks/base: Consistency in core/jni
2014-11-21 10:15:08 -08:00
com_google_android_gles_jni_EGLImpl.cpp
…
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
…