Eino-Ville Talvala 346066ef90 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev ...

automerge: ad5591f

* commit 'ad5591f819466fc1c87d9ca76be8c06673ccce34':
  Legacy: Only set user surface dimensions on output surfaces

2015-02-12 07:52:49 +00:00

..

android

Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

2015-02-10 20:57:45 +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

Move Canvas

2015-01-20 12:39:05 -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

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-09 17:19:45 -08:00

android_hardware_camera2_legacy_LegacyCameraDevice.cpp

am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

2015-02-12 05:54:34 +00: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

am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

2015-01-15 20:13:11 +00: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

Add additional info to AudioPort for enum/selection API.

2015-02-04 14:37:19 -08:00

android_media_AudioTrack.cpp

Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers

2015-01-13 15:41:40 -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

Remove hardcoded include paths.

2014-12-31 10:06:51 +00: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 45838de9: fix Uss accounting in getPssPid()

2014-12-12 04:30:52 +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

Clean up ExceptionOccurred.

2014-08-20 16:24:47 -07:00

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

resolve merge conflicts of 7d13d9d to master.

2014-11-21 14:05:11 -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

Remove DisplayListLogBuffer

2015-01-21 14:22:39 -08: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

Stop pretending USE_OPENGL_RENDERER is a thing

2014-12-18 14:12:27 -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

Adjust format strings to work on both 32-bit and 64-bit builds

2014-12-05 16:14:07 -08:00

android_view_InputEventSender.cpp

Adjust format strings to work on both 32-bit and 64-bit builds

2014-12-05 16:14:07 -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

Stop pretending USE_OPENGL_RENDERER is a thing

2014-12-18 14:12:27 -08:00

android_view_RenderNodeAnimator.cpp

Stop pretending USE_OPENGL_RENDERER is a thing

2014-12-18 14:12:27 -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

Stop pretending USE_OPENGL_RENDERER is a thing

2014-12-18 14:12:27 -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

AvoidXferMode -> AvoidXfermode.

2015-01-30 09:05:11 -05:00

AndroidRuntime.cpp

Merge "Add support for persist.sys.locale." automerge: dca2332 automerge: 117f161

2015-01-22 14:00:51 +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_util_VirtualRefBasePtr.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp

Stop pretending USE_OPENGL_RENDERER is a thing

2014-12-18 14:12:27 -08:00

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

…