android_frameworks_base

Go to file

James Dong 2c17f05a81 Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."

This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.

Conflicts:

	media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426

2011-07-14 16:22:47 -07:00

api

Merge "Introduce TextView drawableStart and drawableEnd"

2011-07-12 18:24:27 -07:00

build

Change max heap size to 48MB

2011-06-22 16:12:41 -07:00

cmds

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

2011-07-12 12:15:07 -07:00

core

Merge "Wait until the audio track finishes playing before releasing it."

2011-07-13 07:30:27 -07:00

data

Merge "Permissions to protect bandwidth statistics."

2011-06-30 00:49:12 -07:00

docs

am d9f91425: am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2

2011-07-08 17:53:12 -07:00

drm

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

graphics

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

2011-07-12 12:15:07 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Make MetadataBufferType.h C-friendly

2011-07-12 09:35:40 -07:00

keystore

Merge "New KeyChain API for credential installation"

2011-07-06 14:59:21 -07:00

libs

Merge "Fix for the renderscript ref counting bug."

2011-07-12 16:27:09 -07:00

location

am e0009bb0: am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

2011-07-01 07:56:15 -07:00

media

Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."

2011-07-14 16:22:47 -07:00

native

Hover and stylus API cleanup.

2011-06-27 21:35:59 -07:00

nfc-extras

Add intent actions for new firmware events.

2011-06-27 18:46:31 -07:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

Merge "fix typo in a comment"

2011-07-12 14:11:57 -07:00

packages

Query the correct Extra for BT intents.

2011-07-11 14:35:56 -07:00

policy

Fix bugs around restoring submenu state after activity teardown/restore

2011-07-12 11:35:15 -07:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

Merge "UsbDeviceManager: clean up HandlerThread creation"

2011-07-13 07:34:29 -07:00

telephony

am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE

2011-07-12 16:38:22 -07:00

test-runner

Test runner cleanup: delete unused old classes.

2011-06-01 20:03:39 -07:00

tests

Merge "Introduce TextView drawableStart and drawableEnd"

2011-07-12 18:24:27 -07:00

tools

LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager

2011-07-12 12:35:50 -07:00

voip

Merge "Keep last known keepalive interval to avoid duplicate effort."

2011-07-04 20:37:33 -07:00

wifi/java/android/net/wifi

Use resetConnections with resetMask.

2011-07-07 16:17:06 -07:00

Android.mk

Add event-log logging for TTS requests.

2011-07-08 17:55:25 +01:00

CleanSpec.mk

Add CleanSpec.mk for change If98e456e779f8e97f562d99c57d909b1f5d9db55.

2011-07-03 17:01:12 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

preloaded-classes

Revert "Don't preload HardwareRenderer, its static initialization is process dependant."

2011-07-12 19:09:03 -07:00

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%