frameworks_base

Go to file

Dianne Hackborn fef966ae46 Fix another merge problem.

Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26

2011-05-19 22:02:22 -07:00

api

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

core

Fix another merge problem.

2011-05-19 22:02:22 -07:00

data

am a49b2dbd: am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."

2011-05-19 03:44:45 -07:00

docs

am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

2011-05-19 11:13:41 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

2011-04-24 12:40:16 -07:00

graphics

Preparing libRS for for compilation on host.

2011-05-17 16:42:24 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

keystore

Move to KeyChain.bind

2011-05-17 16:20:36 -07:00

libs

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

location

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

media

Merge "Publish setLocation() method as a public Java API"

2011-05-19 11:51:37 -07:00

native

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

nfc-extras

Implement dead service recovery in NFC extras library.

2011-04-26 16:38:00 -07:00

obex

am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

2011-04-19 16:01:36 -07:00

opengl

eglTerminate() now actually frees up all active egl objects

2011-05-16 19:03:33 -07:00

packages

Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity."

2011-05-18 17:49:32 -07:00

policy

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

sax

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

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

services

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

telephony

am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

2011-05-19 11:32:27 -07:00

test-runner

Rework display size access.

2011-04-21 15:17:52 -07:00

tests

call clearCache from UI thread

2011-05-18 10:14:44 -07:00

tools

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

voip

update for new audio.h header location

2011-05-12 14:09:57 -07:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

2011-05-19 15:17:33 -07:00

Android.mk

First pass at NetworkPolicy and activity tracking.

2011-05-13 16:20:21 -07:00

CleanSpec.mk

The decoder wrapper is no longer needed. Also disable building old-style decoders.

2011-05-12 11:24:13 -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 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -08:00

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%