android_frameworks_base

android

resolved conflicts for merge of 6c18e2c8 to master

2013-04-17 10:33:23 -07:00

android_animation_PropertyValuesHolder.cpp

…

android_app_backup_FullBackup.cpp

…

android_app_NativeActivity.cpp

Add plumbing for new surface flinger display API.

2012-08-27 14:34:54 -07:00

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

Print extended SQLite error code.

2012-06-12 15:39:09 -07:00

android_database_SQLiteCommon.h

…

android_database_SQLiteConnection.cpp

Fix bugs regarding IllegalStateException during moving position in cursorwindow.

2012-12-20 13:59:52 +09:00

android_database_SQLiteDebug.cpp

…

android_database_SQLiteGlobal.cpp

…

android_ddm_DdmHandleNativeHeap.cpp

Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.

2013-03-26 13:18:52 -07:00

android_debug_JNITest.cpp

…

android_emoji_EmojiFactory.cpp

Possible leak in android_emoji_EmojiFactory_newInstance

2012-12-12 00:57:57 +09:00

android_graphics_PixelFormat.cpp

…

android_hardware_Camera.cpp

remove uses of Surface in favor of IGraphicBufferProducer

2013-03-12 18:43:34 -07:00

android_hardware_SensorManager.cpp

Add new sensor types.

2013-04-11 10:25:35 -07:00

android_hardware_SerialPort.cpp

…

android_hardware_UsbDevice.cpp

…

android_hardware_UsbDeviceConnection.cpp

Support specifying buffer start offset for USB requests.

2013-03-28 03:13:09 -07:00

android_hardware_UsbRequest.cpp

UsbRequest: set ByteBuffer.position() upon success.

2012-08-09 15:28:10 -07:00

android_media_AudioRecord.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

android_media_AudioSystem.cpp

Add support for querying whether the music stream is active remotely

2013-02-11 10:15:47 -08:00

android_media_AudioTrack.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

android_media_JetPlayer.cpp

Add return after NULL check in JetPlayer

2012-12-12 05:34:21 +09:00

android_media_RemoteDisplay.cpp

clean-up following Surface split

2013-02-15 12:47:40 -08:00

android_media_ToneGenerator.cpp

am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup"

2012-12-20 11:07:04 -08:00

android_net_LocalSocketImpl.cpp

…

android_net_NetUtils.cpp

Don't update routes if Dhcp fails.

2013-03-15 10:48:46 -07:00

android_net_TrafficStats.cpp

jni: net.TrafficStats: fix getIfaceStat, have it use the iface.

2013-03-04 18:53:07 +00:00

android_net_wifi_Wifi.cpp

Stop supplicant and dhcp before start

2012-11-06 15:53:32 -08:00

android_nfc.h

…

android_nio_utils.cpp

…

android_nio_utils.h

…

android_opengl_EGL14.cpp

Add eglPresentationTimeANDROID

2013-03-05 11:16:10 -08:00

android_opengl_GLES10.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

android_opengl_GLES10Ext.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

android_opengl_GLES11.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

android_opengl_GLES11Ext.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

android_opengl_GLES20.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

android_opengl_GLES30.cpp

Add android.opengl.GLES30, hidden for now

2013-04-15 17:37:33 -07:00

android_os_Debug.cpp

Track stack memory in MemoryInfo.

2013-02-27 11:34:42 -08:00

android_os_FileUtils.cpp

Use Libcore.os.umask for setting umask

2012-08-20 12:24:05 -07:00

android_os_MemoryFile.cpp

…

android_os_MessageQueue.cpp

Optimize Looper JNI code.

2013-01-28 14:25:53 -08:00

android_os_MessageQueue.h

…

android_os_Parcel.cpp

Improve notifying TimedText by reducing marshall/unmarshalling.

2012-05-09 20:14:09 +09:00

android_os_Parcel.h

Improve notifying TimedText by reducing marshall/unmarshalling.

2012-05-09 20:14:09 +09:00

android_os_ParcelFileDescriptor.cpp

…

android_os_SELinux.cpp

Update SELinux JNI to use helpers

2013-03-20 15:24:25 -07:00

android_os_SystemClock.cpp

Fix JNI method signature.

2012-09-26 18:46:08 -07:00

android_os_SystemProperties.cpp

Add callback hack to find out when to load system properties.

2012-05-09 14:53:20 -07:00

android_os_Trace.cpp

Disable tracing from Zygote

2013-04-16 22:15:21 +00:00

android_os_UEventObserver.cpp

Fix off-by-one.

2012-10-11 15:58:49 -07:00

android_server_NetworkManagementSocketTagger.cpp

…

android_server_Watchdog.cpp

…

android_text_AndroidBidi.cpp

…

android_text_AndroidCharacter.cpp

Fix bug 6688060: breakage in AndroidCharacter.mirror

2012-06-18 16:17:30 -07:00

android_text_format_Time.cpp

am 08153ee0: Switch DateUtils and Time over to using the CLDR for all week and month names.

2012-09-15 16:12:06 -07:00

android_util_AssetManager.cpp

Add new resources trace, also trace apk dex loading.

2013-04-12 14:53:10 -07:00

android_util_Binder.cpp

Fix reference cycle in InputEventReceiver and Sender.

2013-04-02 18:59:15 -07:00

android_util_Binder.h

…

android_util_EventLog.cpp

convert jint to uint32_t.

2012-12-07 16:56:47 -08:00

android_util_FileObserver.cpp

…

android_util_FloatMath.cpp

Add FloatMath.pow.

2012-08-21 22:27:41 -07:00

android_util_Log.cpp

…

android_util_Log.h

…

android_util_Process.cpp

Add method to get process group.

2013-01-17 14:12:49 -08:00

android_util_StringBlock.cpp

StringBlock_nativeCreate: Possible Leak

2012-12-21 06:19:38 +09:00

android_util_XmlBlock.cpp

…

android_view_DisplayEventReceiver.cpp

Process all display events in order

2013-02-07 22:01:19 +00:00

android_view_GLES20Canvas.cpp

Restore final canvas state after deferred flush

2013-03-22 11:54:51 -07:00

android_view_GLES20DisplayList.cpp

Expose display list APIs

2013-02-19 12:30:02 -08:00

android_view_HardwareRenderer.cpp

Apply dev. settings at runtime

2012-11-30 16:29:33 -08:00

android_view_InputChannel.cpp

Correctly manage the lifecycle of IME InputChannels.

2013-04-04 22:45:12 -07:00

android_view_InputChannel.h

…

android_view_InputDevice.cpp

Pipe through device resolution information

2013-04-04 18:10:37 -07:00

android_view_InputDevice.h

…

android_view_InputEventReceiver.cpp

Fix reference cycle in InputEventReceiver and Sender.

2013-04-02 18:59:15 -07:00

android_view_InputEventSender.cpp

Fix reference cycle in InputEventReceiver and Sender.

2013-04-02 18:59:15 -07:00

android_view_KeyCharacterMap.cpp

…

android_view_KeyCharacterMap.h

…

android_view_KeyEvent.cpp

…

android_view_KeyEvent.h

…

android_view_MotionEvent.cpp

…

android_view_MotionEvent.h

…

android_view_PointerIcon.cpp

…

android_view_PointerIcon.h

…

android_view_Surface.cpp

make Surface.java internal state thread-safe

2013-03-18 20:29:18 -07:00

android_view_SurfaceControl.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

android_view_SurfaceSession.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

android_view_TextureView.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

android_view_VelocityTracker.cpp

Make velocity tracker strategy configurable.

2012-06-03 19:21:49 -07:00

Android.mk

Add android.opengl.GLES30, hidden for now

2013-04-15 17:37:33 -07:00

AndroidRuntime.cpp

Use input transport for communications between app and IME.

2013-03-26 15:42:39 -07:00

BindTest.cpp

…

com_android_internal_content_NativeLibraryHelper.cpp

…

com_android_internal_net_NetworkStatsFactory.cpp

Parse network stats using native code.

2013-02-13 17:40:49 -08:00

com_android_internal_os_ZygoteInit.cpp

am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."

2013-03-01 17:41:53 +00:00

com_google_android_gles_jni_EGLImpl.cpp

Refactoring: Rename SurfaceTextureClient to Surface

2013-02-15 12:47:40 -08:00

com_google_android_gles_jni_GLImpl.cpp

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

GraphicsExternGlue.h

…

GraphicsRegisterGlue.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

Time.cpp

…

TimeUtils.h

…