frameworks_base

Go to file

Dmitriy Ivanov c4e52d0ed9 resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp.

Change-Id: I5cbcf74319afc3ae9d0e9280b572a59286565de8

2014-12-10 16:22:00 -08:00

api

Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev

2014-12-10 17:56:58 +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 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev

2014-12-11 00:07:32 +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 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs

2014-12-10 20:04:31 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state

2014-12-11 00:07:20 +00:00

include

am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

2014-12-11 00:07:02 +00:00

keystore

Track change to Conscrypt

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

libs

am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

2014-12-11 00:07:02 +00: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

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

2014-12-10 10:42:08 -08: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

am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev

2014-12-10 19:16:38 +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

…

services

am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980 : questions on LMK memory changes" into lmp-mr1-dev

2014-12-11 00:07:26 +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 eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev

2014-12-10 19:23:23 +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 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

2014-12-09 22:18:27 +00:00

tools

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

2014-12-09 00:43:14 +00:00

wifi/java/android/net/wifi

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

2014-12-08 19:36:33 +00:00

Android.mk

Support collaborative audio focus handling

2014-12-05 18:41:28 -08: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%