drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/core/jni
History
Tom Hudson d8f904f256 Revert "Merge six commits from master-skia to master" 
This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
2015-10-28 20:35:36 +00:00
..
android
Revert "Merge six commits from master-skia to master"
2015-10-28 20:35:36 +00:00
android_animation_PropertyValuesHolder.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_app_backup_FullBackup.cpp
…
android_app_NativeActivity.cpp
…
android_backup_BackupDataInput.cpp
…
android_backup_BackupDataOutput.cpp
…
android_backup_BackupHelperDispatcher.cpp
…
android_backup_FileBackupHelperBase.cpp
…
android_content_res_Configuration.cpp
…
android_content_res_ObbScanner.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_database_CursorWindow.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_database_SQLiteCommon.cpp
…
android_database_SQLiteCommon.h
…
android_database_SQLiteConnection.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_database_SQLiteDebug.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_database_SQLiteGlobal.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_ddm_DdmHandleNativeHeap.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_graphics_Canvas.cpp
FastJNI canvas
2015-10-05 12:14:23 -07:00
android_graphics_Picture.cpp
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:23:00 +00:00
android_hardware_camera2_CameraMetadata.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_hardware_camera2_DngCreator.cpp
am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.
2015-10-17 07:13:24 +00:00
android_hardware_camera2_legacy_LegacyCameraDevice.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_hardware_camera2_legacy_PerfMeasurement.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_hardware_Camera.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_hardware_location_ActivityRecognitionHardware.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_hardware_Radio.cpp
…
android_hardware_SensorManager.cpp
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:14:10 +00:00
android_hardware_SerialPort.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_hardware_SoundTrigger.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_hardware_UsbDevice.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_hardware_UsbDeviceConnection.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_hardware_UsbRequest.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_media_AudioErrors.h
AudioTrack: error reporting for getTimestamp()
2015-08-27 17:52:38 +00:00
android_media_AudioFormat.h
…
android_media_AudioRecord.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_media_AudioSystem.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_media_AudioTrack.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_media_AudioTrack.h
…
android_media_DeviceCallback.cpp
…
android_media_DeviceCallback.h
…
android_media_JetPlayer.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_media_RemoteDisplay.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_media_ToneGenerator.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_net_LocalSocketImpl.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_net_NetUtils.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_net_TrafficStats.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_nio_utils.cpp
…
android_nio_utils.h
…
android_opengl_EGL14.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_EGLExt.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES10.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES10Ext.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES11.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES11Ext.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES20.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES30.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES31.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_opengl_GLES31Ext.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_os_Debug.cpp
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b
2015-10-19 23:51:35 +00:00
android_os_MemoryFile.cpp
…
android_os_MessageQueue.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_os_MessageQueue.h
…
android_os_Parcel.cpp
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b
2015-10-23 18:25:02 +00:00
android_os_Parcel.h
…
android_os_SELinux.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_os_SystemClock.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_os_SystemProperties.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_os_Trace.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_os_UEventObserver.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_server_NetworkManagementSocketTagger.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_server_Watchdog.cpp
…
android_text_AndroidBidi.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_text_AndroidCharacter.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_text_StaticLayout.cpp
am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev
2015-10-15 00:31:44 +00:00
android_util_AssetManager.cpp
am d0c806b1: am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
2015-10-13 01:24:16 +00:00
android_util_Binder.cpp
…
android_util_Binder.h
…
android_util_EventLog.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_util_FileObserver.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_util_Log.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_util_Log.h
…
android_util_Process.cpp
…
android_util_StringBlock.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_util_XmlBlock.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_view_DisplayEventReceiver.cpp
FastJNI canvas
2015-10-05 12:14:23 -07:00
android_view_DisplayListCanvas.cpp
FastJNI canvas
2015-10-05 12:14:23 -07:00
android_view_GraphicBuffer.cpp
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:23:00 +00:00
android_view_GraphicBuffer.h
…
android_view_HardwareLayer.cpp
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:23:00 +00:00
android_view_InputChannel.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_view_InputChannel.h
…
android_view_InputDevice.cpp
…
android_view_InputDevice.h
…
android_view_InputEventReceiver.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_view_InputEventSender.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_view_InputQueue.cpp
…
android_view_KeyCharacterMap.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_view_KeyCharacterMap.h
…
android_view_KeyEvent.cpp
…
android_view_KeyEvent.h
…
android_view_MotionEvent.cpp
Use FastJNI for trivial MotionEvent native methods
2015-10-16 11:39:50 -07:00
android_view_MotionEvent.h
…
android_view_PointerIcon.cpp
…
android_view_PointerIcon.h
Allow changing mouse pointer icon for the current context.
2015-10-15 01:47:29 -07:00
android_view_RenderNode.cpp
Rename DisplayListData to DisplayList
2015-10-16 10:38:34 -07:00
android_view_RenderNodeAnimator.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
android_view_Surface.cpp
Revert "Merge six commits from master-skia to master"
2015-10-28 20:35:36 +00:00
android_view_SurfaceControl.cpp
Revert "Merge six commits from master-skia to master"
2015-10-28 20:35:36 +00:00
android_view_SurfaceSession.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
android_view_TextureView.cpp
Revert "Merge six commits from master-skia to master"
2015-10-28 20:35:36 +00:00
android_view_ThreadedRenderer.cpp
Rendering the window frame with a second thread
2015-10-02 07:11:45 -07:00
android_view_VelocityTracker.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
Android.mk
Revert "Merge six commits from master-skia to master"
2015-10-28 20:35:36 +00:00
AndroidRuntime.cpp
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:23:00 +00:00
BindTest.cpp
…
com_android_internal_content_NativeLibraryHelper.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
com_android_internal_net_NetworkStatsFactory.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
com_android_internal_os_Zygote.cpp
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 17:23:00 +00:00
com_android_internal_util_VirtualRefBasePtr.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
com_google_android_gles_jni_EGLImpl.cpp
resolved conflicts for a884d81e to stage-aosp-master
2015-09-24 10:01:32 -07:00
com_google_android_gles_jni_GLImpl.cpp
constify JNINativeMethod function pointer tables
2015-09-22 17:10:35 -04:00
core_jni_helpers.h
…
GraphicsExternGlue.h
…
GraphicsRegisterGlue.h
…
MODULE_LICENSE_APACHE2
…
NOTICE
…