frameworks_base

Go to file

Eric Laurent 7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration

2014-12-10 21:57:35 +00:00

api

am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev

2014-12-09 22:23:37 +00:00

cmds

am bedd1744: am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev

2014-12-03 20:42:17 +00:00

core

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

data

Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

2014-12-05 07:27:33 +00:00

docs

am 0318a228: am 614889aa: am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs

2014-12-10 17:44:31 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

resolved conflicts for merge of 3bae94d7 to master

2014-12-10 11:03:40 -08:00

include

Merge commit '0953ab27' into manualmerge

2014-12-05 11:06:21 -08:00

keystore

Track change to Conscrypt

2014-11-26 09:08:40 -08:00

libs

resolved conflicts for merge of 3bae94d7 to master

2014-12-10 11:03:40 -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 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

native

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

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

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Re-allow suppressing onDetachedFromWindow

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

packages

Merge "Import translations. DO NOT MERGE"

2014-12-10 15:08:22 +00:00

policy

am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

2014-12-03 20:43:40 +00:00

Fix bug in passing of context flags and version.

2014-12-02 17:24:17 -08:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack"

2014-12-10 21:57:22 +00:00

telecomm/java

Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

2014-12-06 01:45:12 +00:00

telephony/java

am 6549e9be: am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev

2014-12-09 23:49:00 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

2014-12-09 23:49:22 +00:00

tools

am 55188f59: am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

2014-12-09 23:22:00 +00:00

wifi/java/android/net/wifi

am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

2014-12-09 01:00:29 +00:00

Android.mk

am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

2014-12-09 11:06:11 +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 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%