android_frameworks_base

Go to file

Adam Lesinski 11bdd5b10b Merge commit '06d8b7b8' into manualmerge

Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca

2014-11-17 12:17:16 -08:00

api

Camera2: Add BURST_CAPTURE capability flag

2014-11-17 17:50:05 +00:00

cmds

am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev

2014-11-15 01:24:30 +00:00

core

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

data

Use fonts for smaller languages of South and Southeast Asia.

2014-11-10 12:49:20 -08:00

docs

am af56f979: am b04c3d62: am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs

2014-11-17 19:53:34 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev

2014-11-14 21:53:11 +00:00

include

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

keystore

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

libs

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

location

am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev

2014-11-07 18:43:36 +00:00

media

am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"

2014-11-17 18:24:54 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

am 58b9ee28: am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev

2014-11-17 19:53:46 +00:00

policy

am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev

2014-11-15 02:49:37 +00:00

Add Float32 suppor for IntrinsicResize. base part.

2014-11-13 15:32:18 -08:00

samples/training/network-usage

…

sax

…

services

am 58cdb919: am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev

2014-11-17 19:53:40 +00:00

telecomm/java

Fix PhoneAccount parceling (1/2)

2014-11-11 18:43:13 -08:00

telephony/java

am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev

2014-11-17 19:53:16 +00:00

test-runner

am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

2014-10-30 23:44:09 +00:00

tests

am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev

2014-11-14 00:03:16 +00:00

tools

am 537888be: Merge "kill HAVE_LOCALTIME_R"

2014-11-13 19:05:06 +00:00

wifi/java/android/net/wifi

Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 3f558e7

2014-11-12 03:23:35 +00:00

Android.mk

Move preloaded-classes out of framework.jar.

2014-11-17 10:15:39 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%