android_frameworks_base

android

resolved conflicts for merge of 92860a74 to master

2014-03-10 10:57:05 +00:00

android_animation_PropertyValuesHolder.cpp

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 11:07:06 +00:00

android_app_backup_FullBackup.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_app_NativeActivity.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_backup_BackupDataInput.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_backup_BackupDataOutput.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_backup_BackupHelperDispatcher.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_backup_FileBackupHelperBase.cpp

AArch64: Use long for pointers in App/Backup

2014-01-08 11:54:01 +00:00

android_content_res_Configuration.cpp

…

android_content_res_ObbScanner.cpp

…

android_database_CursorWindow.cpp

AArch64: Use long for pointers

2014-01-08 11:53:21 +00:00

android_database_SQLiteCommon.cpp

…

android_database_SQLiteCommon.h

…

android_database_SQLiteConnection.cpp

AArch64: Use long for pointers

2014-01-08 11:53:21 +00:00

android_database_SQLiteDebug.cpp

…

android_database_SQLiteGlobal.cpp

frameworks/base: fix errors inside ALOGV

2014-02-09 21:54:01 -08:00

android_ddm_DdmHandleNativeHeap.cpp

…

android_emoji_EmojiFactory.cpp

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

android_hardware_camera2_CameraMetadata.cpp

…

android_hardware_Camera.cpp

AArch64: Use long for pointers in hardware classes

2014-01-08 10:17:21 +00:00

android_hardware_SensorManager.cpp

AArch64: Use long for pointers in hardware classes

2014-01-08 10:17:21 +00:00

android_hardware_SerialPort.cpp

…

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

Add support for USB devices with multiple configurations and alternate interfaces

2014-02-27 09:59:02 -08:00

android_hardware_UsbRequest.cpp

AArch64: Use long for pointers in hardware classes

2014-01-08 10:17:21 +00:00

android_media_AudioFormat.h

Prepare for additional formats beyond 8-bit and 16-bit PCM

2014-01-10 10:50:22 -08:00

android_media_AudioRecord.cpp

am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"

2014-02-28 13:53:15 +00:00

android_media_AudioSystem.cpp

Resolved conflicts for merge of 28c6ec02 to master

2014-01-16 15:49:59 +00:00

android_media_AudioTrack.cpp

AudioTrack constructor/set parameter frameCount is size_t

2014-02-27 15:53:50 -08:00

android_media_JetPlayer.cpp

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

android_media_RemoteDisplay.cpp

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

android_media_ToneGenerator.cpp

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

…

android_net_TrafficStats.cpp

…

android_nfc.h

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_EGL14.cpp

AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY

2014-02-26 19:07:54 +00:00

android_opengl_EGLExt.cpp

Use long for pointers in opengl/EGL classes

2014-02-24 15:50:22 +00:00

android_opengl_GLES10.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_opengl_GLES10Ext.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_opengl_GLES11.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_opengl_GLES11Ext.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_opengl_GLES20.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_opengl_GLES30.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

android_os_Debug.cpp

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

2013-11-22 11:18:57 -08:00

android_os_MemoryFile.cpp

Fix error checking in MemoryFile.

2014-01-16 13:18:28 +00:00

android_os_MessageQueue.cpp

AArch64: Use long for pointers in android/os/MessageQueue

2014-01-10 15:36:16 +00:00

android_os_MessageQueue.h

…

android_os_Parcel.cpp

AArch64: Make Binder and Parcel 64-bit compatible

2014-01-23 16:25:19 +00:00

android_os_Parcel.h

…

android_os_SELinux.cpp

Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

2014-02-12 23:09:37 +00:00

android_os_SystemClock.cpp

Move time setting code from SystemClock to AlarmManagerService

2014-02-21 09:53:19 -08:00

android_os_SystemProperties.cpp

…

android_os_Trace.cpp

Trace: add ALOGVs for easier debugging

2013-10-17 18:19:48 -07:00

android_os_UEventObserver.cpp

…

android_server_NetworkManagementSocketTagger.cpp

…

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_format_Time.cpp

…

android_util_AssetManager.cpp

Runtime resource overlay, iteration 2

2014-02-03 11:20:30 +01:00

android_util_Binder.cpp

AArch64: Make Binder and Parcel 64-bit compatible

2014-01-23 16:25:19 +00:00

android_util_Binder.h

…

android_util_EventLog.cpp

jni: Resolve build warnings

2014-01-27 15:25:51 -08:00

android_util_FileObserver.cpp

…

android_util_FloatMath.cpp

…

android_util_Log.cpp

…

android_util_Log.h

…

android_util_Process.cpp

ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE

2014-01-03 16:30:25 -08:00

android_util_StringBlock.cpp

AArch64: Make AssetManager and related classes 64-bit compatible

2014-01-31 14:14:29 +00:00

android_util_XmlBlock.cpp

AArch64: Make AssetManager and related classes 64-bit compatible

2014-01-31 14:14:29 +00:00

android_view_DisplayEventReceiver.cpp

AArch64: Use long for pointers in DisplayEventReceiver

2014-01-07 12:48:43 +00:00

android_view_DisplayList.cpp

DisplayList overhaul

2014-03-04 15:18:16 -08:00

android_view_GLES20Canvas.cpp

DisplayList overhaul

2014-03-04 15:18:16 -08:00

android_view_GLRenderer.cpp

DisplayList lifecycle changes

2014-03-10 10:12:32 -07:00

android_view_GraphicBuffer.cpp

AArch64: Make graphics classes 64-bit compatible

2014-01-28 17:40:38 +00:00

android_view_GraphicBuffer.h

…

android_view_HardwareLayer.cpp

Reapply "Refactor setting an SkPaint onto a hwui Layer."

2014-02-20 16:20:33 -05:00

android_view_InputChannel.cpp

AArch64: Use long for pointers in view/input classes

2014-01-09 15:12:04 +00:00

android_view_InputChannel.h

…

android_view_InputDevice.cpp

…

android_view_InputDevice.h

…

android_view_InputEventReceiver.cpp

AArch64: Use long for pointers in view/input classes

2014-01-09 15:12:04 +00:00

android_view_InputEventSender.cpp

AArch64: Use long for pointers in view/input classes

2014-01-09 15:12:04 +00:00

android_view_InputQueue.cpp

AArch64: Use long for pointers in view/input classes

2014-01-09 15:12:04 +00:00

android_view_KeyCharacterMap.cpp

AArch64: Use long for pointers in KeyCharacterMap class

2014-01-08 18:19:21 +00:00

android_view_KeyCharacterMap.h

…

android_view_KeyEvent.cpp

…

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

AArch64: Use long for pointers in MotionEvent class

2014-01-08 18:31:59 +00:00

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

…

android_view_PointerIcon.h

…

android_view_Surface.cpp

change Surface constructor arg to 64bit

2014-01-30 09:50:21 +00:00

android_view_SurfaceControl.cpp

Updates to the Skia API needed to merge the WebView m33 version of Skia.

2014-02-24 15:44:31 -05:00

android_view_SurfaceSession.cpp

AArch64: Use long for pointers in SurfaceSession class

2014-02-06 16:57:49 +00:00

android_view_TextureView.cpp

am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

2014-01-29 15:40:59 +00:00

android_view_ThreadedRenderer.cpp

DisplayList lifecycle changes

2014-03-10 10:12:32 -07:00

android_view_VelocityTracker.cpp

AArch64: Use long for pointers in VelocityTracker class

2014-01-08 18:48:19 +00:00

Android.mk

Fix use of Skia deprecated methods

2014-02-28 12:26:34 -08:00

AndroidRuntime.cpp

am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

2014-03-10 17:57:35 +00:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

Don't confuse stat and stat64.

2014-01-17 18:27:27 -08:00

com_android_internal_net_NetworkStatsFactory.cpp

Improve how battery stats collects network stats.

2014-02-24 11:35:20 -08:00

com_android_internal_os_ZygoteInit.cpp

Remove incorrect (and unused) capget code.

2013-11-07 22:35:23 -08:00

com_google_android_gles_jni_EGLImpl.cpp

Avoid restrictive locking around EGL calls

2014-03-04 09:59:30 -08:00

com_google_android_gles_jni_GLImpl.cpp

Use reinterpret_cast when an integer is cast to a pointer

2014-02-24 14:33:52 +00:00

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

Time.cpp

…

TimeUtils.h

…