frameworks_base

Go to file

Robert Greenwalt d685c731bf resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp

Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd

2011-04-04 11:21:23 -07:00

api

am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread

2011-02-01 10:10:42 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

core

am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"

2011-04-04 10:17:43 -07:00

data

am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread

2011-03-24 03:36:31 -07:00

docs

am 1df862a4: Minor doc update.

2011-02-16 09:23:08 -08:00

drm

Merge "Initial OMA DRM forward lock contribution"

2011-01-13 10:51:13 -08:00

graphics

Merge "Fixing the wrong link in YuvImage JavaDoc."

2011-03-23 12:30:28 -07:00

include

am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable

2011-03-31 18:55:26 -07:00

keystore

Work on issue #3101415 : Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread

2011-03-15 14:49:37 -07:00

location

Fixed GSM encoded network initiated position request

2011-02-22 14:35:47 +01:00

media

am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

2011-03-28 08:26:02 -07:00

native

Flush Binder commands in ndk looper.

2011-01-10 14:37:46 -08:00

nfc-extras

NfcAdapterExtras: reset singleton state if initialization fails.

2011-03-21 16:51:06 -07:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 08:38:30 +02:00

opengl

Merge from gingerbread

2011-03-29 13:54:43 -07:00

packages

am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread

2011-03-21 18:02:57 -07:00

policy

am 62619392: Merge "Fix leak when keylock is recreated."

2011-02-28 18:03:12 -08:00

sax

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

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

services

am e558a000: Merge "Avoid crash in system server when mounting container"

2011-04-04 10:17:35 -07:00

telephony

am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."

2011-03-23 12:44:23 -07:00

test-runner

am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."

2011-02-28 10:15:46 -08:00

tests

Error in compound cache-control header.

2011-03-29 08:54:09 +02:00

tools

am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.

2011-03-17 16:21:20 -07:00

voip

Making it possible to call SIP calls with special allowed chars.

2011-03-22 08:03:58 +01:00

vpn

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

wifi/java/android/net/wifi

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

2010-12-04 23:45:18 -08:00

Android.mk

am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).

2011-03-10 16:32:28 -08:00

CleanSpec.mk

Implement new NFC-EE API's as shared library (frameworks/base).

2011-03-10 16:03:46 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

Fix omission in NOTICE file.

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

preloaded-classes

This class no longer exists.

2010-11-04 16:17:52 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%