frameworks_base

Go to file

Xavier Ducrohet 86e43034a6 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp

Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7

2011-02-24 16:15:11 -08: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

Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread

2011-02-24 09:20:46 -08:00

data

Move keymaps from sdk/emulator/keymaps.

2011-01-25 19:08:04 -08: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

am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"

2011-01-14 16:11:40 -08:00

include

am 93552de8: Merge "stubs"

2011-02-11 09:54:59 -08: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 e88fa50b: Merge from open-source gingerbread

2011-01-30 16:19:59 -08:00

location

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

media

am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.

2011-02-16 14:24:53 -08:00

native

Flush Binder commands in ndk looper.

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

obex

Bluetooth OBEX timeout problem.

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

opengl

am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread

2011-02-23 12:46:57 -08:00

packages

Updated iconography for network status and adding 4G assets

2011-02-22 16:12:46 -08:00

policy

Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

2011-01-27 18:22:14 -08:00

sax

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

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

services

am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

2011-02-16 10:51:04 -08:00

telephony

am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

2011-02-15 12:38:38 -08:00

test-runner

am 524133cc: Remove API that snuck into MockPackageManager

2011-01-17 13:05:24 -08:00

tests

Delete browerplugin tests - do not merge

2011-01-29 07:41:39 -08:00

tools

resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp

2011-02-24 16:15:11 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08: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

enable preview mode for docs and add api level 10 flag for api level diffs

2011-01-26 18:29:50 -08:00

CleanSpec.mk

Rough first pass at the NFC technology API.

2010-11-19 20:26:29 -06: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%