Mark Salyzyn 22221f6981 Merge "resolve merge conflicts of ec7e2a164c37 to master"

2017-01-12 17:23:01 +00:00

..

android

Merge "resolve merge conflicts of ec7e2a164c37 to master"

2017-01-12 17:23:01 +00:00

hwbinder

Removed legacy code used to read/write java arrays from HwBinder parcels.

2016-09-19 14:09:14 -07:00

include/android_runtime

Remove RGBX_FP16 format

2016-12-16 10:23:21 -08:00

android_animation_PropertyValuesHolder.cpp

…

android_app_Activity.cpp

…

android_app_admin_SecurityLog.cpp

jni: move security interfaces to private

2016-10-05 08:04:46 -07:00

android_app_ApplicationLoaders.cpp

…

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

…

android_database_CursorWindow.cpp

…

android_database_SQLiteCommon.cpp

…

android_database_SQLiteCommon.h

…

android_database_SQLiteConnection.cpp

…

android_database_SQLiteDebug.cpp

…

android_database_SQLiteGlobal.cpp

…

android_ddm_DdmHandleNativeHeap.cpp

…

android_graphics_Canvas.cpp

Remove clipRegion from the public API.

2017-01-04 14:57:43 -05:00

android_graphics_drawable_AnimatedVectorDrawable.cpp

resolve merge conflicts of ec7e2a164c37 to master

2017-01-12 08:28:30 -08:00

android_graphics_drawable_VectorDrawable.cpp

Convert VD/AVD to FastNative

2016-10-07 10:33:44 -07:00

android_graphics_Picture.cpp

…

android_hardware_camera2_CameraMetadata.cpp

…

android_hardware_camera2_DngCreator.cpp

…

android_hardware_camera2_legacy_LegacyCameraDevice.cpp

…

android_hardware_camera2_legacy_PerfMeasurement.cpp

…

android_hardware_Camera.cpp

CameraJNI: Fix memory leak in stop recording.

2016-09-08 15:55:20 -07:00

android_hardware_location_ActivityRecognitionHardware.cpp

Deprecate the activity recognition HAL.

2016-11-19 11:16:07 -08:00

android_hardware_Radio.cpp

Make metadata field mandatory for program info struct.

2017-01-06 14:18:34 -08:00

android_hardware_SensorManager.cpp

…

android_hardware_SerialPort.cpp

…

android_hardware_SoundTrigger.cpp

…

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

Merge "Add UsbDeviceConnection.requestWait with a timeout"

2016-10-27 16:15:15 +00:00

android_hardware_UsbRequest.cpp

Correctly use ByteBuffer in UsbRequest

2016-10-27 10:25:40 -07:00

android_media_AudioErrors.h

…

android_media_AudioFormat.h

…

android_media_AudioRecord.cpp

…

android_media_AudioSystem.cpp

Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e am: da3de76bdb

2017-01-04 03:54:18 +00:00

android_media_AudioTrack.cpp

…

android_media_AudioTrack.h

…

android_media_DeviceCallback.cpp

…

android_media_DeviceCallback.h

…

android_media_JetPlayer.cpp

…

android_media_RemoteDisplay.cpp

…

android_media_ToneGenerator.cpp

…

android_net_LocalSocketImpl.cpp

LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs

2016-12-20 07:14:49 -08:00

android_net_NetUtils.cpp

Have IpManager track L2-L4 signaling traffic required for IP connectivity.

2016-12-15 10:13:36 +00:00

android_net_TrafficStats.cpp

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_EGL14.cpp

…

android_opengl_EGLExt.cpp

…

android_opengl_GLES10.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES10Ext.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES11.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES11Ext.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES20.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES30.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES31.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES31Ext.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_opengl_GLES32.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

android_os_Debug.cpp

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

android_os_HwBinder.cpp

BpBase -> BpHwBase

2017-01-09 17:59:49 -08:00

android_os_HwBinder.h

…

android_os_HwBlob.cpp

…

android_os_HwBlob.h

Fix include after spliting HidlSupport.h

2016-11-15 16:02:40 -08:00

android_os_HwParcel.cpp

Use new read(Embedded)Buffer APIs.

2017-01-11 13:33:19 +01:00

android_os_HwParcel.h

Add checked exceptions to HwBinder transact.

2017-01-04 01:13:16 +00:00

android_os_HwRemoteBinder.cpp

Add checked exceptions to HwBinder transact.

2017-01-04 01:13:16 +00:00

android_os_HwRemoteBinder.h

Add (un)linkToDeath support to HwBinder.

2016-12-29 04:22:30 +00:00

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

…

android_os_MessageQueue.h

…

android_os_Parcel.cpp

Switch Parcel to FastNative

2016-09-30 11:19:10 -07:00

android_os_Parcel.h

…

android_os_SELinux.cpp

Move frameworks/base to std::unique_ptr.

2016-09-11 14:50:12 -07:00

android_os_SystemClock.cpp

SystemClock JNI update

2016-10-03 16:03:31 -07:00

android_os_SystemProperties.cpp

Add SystemProperties.reportSyspropChanged().

2016-11-21 17:57:13 +00:00

android_os_Trace.cpp

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

android_os_UEventObserver.cpp

…

android_server_NetworkManagementSocketTagger.cpp

…

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

…

android_text_StaticLayout.cpp

Introduce full justification.

2017-01-05 18:14:15 +09:00

android_util_AssetManager.cpp

Clean up ApplyStyle JNI

2016-12-02 12:49:20 -08:00

android_util_Binder.cpp

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

android_util_Binder.h

…

android_util_EventLog.cpp

Replace cutils/log.h and log/logger.h with android/log.h or log/log.h

2017-01-11 15:30:30 -08:00

android_util_FileObserver.cpp

…

android_util_jar_StrictJarFile.cpp

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

android_util_Log.cpp

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

android_util_Log.h

…

android_util_MemoryIntArray.cpp

Fix vulnerability in MemoryIntArray

2016-12-09 00:08:33 +00:00

android_util_PathParser.cpp

Convert utils fastjni -> @FastNative

2016-10-10 07:59:25 -07:00

android_util_Process.cpp

Fix incorrect FIFO cgroup assignment.

2016-12-20 22:17:29 +00:00

android_util_StringBlock.cpp

…

android_util_XmlBlock.cpp

Convert utils fastjni -> @FastNative

2016-10-10 07:59:25 -07:00

android_view_DisplayEventReceiver.cpp

DisplayEventReceiver -> @FastNative

2016-10-03 16:21:30 -07:00

android_view_DisplayListCanvas.cpp

CriticalNative for RenderNode and DisplayListCanvas

2016-12-15 11:30:08 -08:00

android_view_HardwareLayer.cpp

use SkBlendMode

2016-11-02 11:36:48 -04:00

android_view_InputChannel.cpp

…

android_view_InputChannel.h

…

android_view_InputDevice.cpp

…

android_view_InputDevice.h

…

android_view_InputEventReceiver.cpp

…

android_view_InputEventSender.cpp

…

android_view_InputQueue.cpp

…

android_view_KeyCharacterMap.cpp

…

android_view_KeyCharacterMap.h

…

android_view_KeyEvent.cpp

…

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

Update MotionEvent JNI

2016-10-03 15:47:18 -07:00

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

…

android_view_PointerIcon.h

…

android_view_RenderNode.cpp

Fix non-critical jni entry points

2016-12-15 16:35:10 -08:00

android_view_RenderNodeAnimator.cpp

…

android_view_Surface.cpp

Remove RGBX_FP16 format

2016-12-16 10:23:21 -08:00

android_view_SurfaceControl.cpp

Remove RGBX_FP16 format

2016-12-16 10:23:21 -08:00

android_view_SurfaceSession.cpp

…

android_view_TextureView.cpp

Remove RGBX_FP16 format

2016-12-16 10:23:21 -08:00

android_view_ThreadedRenderer.cpp

Move GraphicBuffer to graphics package

2017-01-04 14:01:52 -08:00

android_view_VelocityTracker.cpp

…

Android.mk

Introduce set/getFontVariationSettings.

2017-01-12 18:11:03 +09:00

AndroidRuntime.cpp

Move GraphicBuffer to graphics package

2017-01-04 14:01:52 -08:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

NativeLibraryHelper: Minor fixes

2016-12-16 08:23:55 -08:00

com_android_internal_net_NetworkStatsFactory.cpp

DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.

2016-12-09 13:59:33 +09:00

com_android_internal_os_FuseAppLoop.cpp

Adding FUSE loop thread in app side.

2016-12-01 13:16:14 +09:00

com_android_internal_os_PathClassLoaderFactory.cpp

…

com_android_internal_os_Zygote.cpp

Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5

2017-01-11 02:46:57 +00:00

com_android_internal_util_VirtualRefBasePtr.cpp

…

com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp

Introduce PathInterpolator to native animators

2016-11-30 16:03:23 -08:00

com_google_android_gles_jni_EGLImpl.cpp

Deprecate eglCreatePixmapSurface

2016-11-30 10:20:29 -08:00

com_google_android_gles_jni_GLImpl.cpp

Add null checks for *Buffer params

2016-12-05 12:26:02 -08:00

core_jni_helpers.h

…

fd_utils.cpp

Zygote: Add fdsToIgnore

2017-01-10 16:55:34 -08:00

fd_utils.h

Zygote: Add fdsToIgnore

2017-01-10 16:55:34 -08:00

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…