frameworks_base

Go to file

Chris Craik a5f0918ec1 resolved conflicts for merge of fd461ede to master

Change-Id: I36f263c7e6d96355dd8a2c3565581b9a983ae481

2014-12-17 15:11:30 -08:00

api

am 2045d5f3: am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev

2014-12-17 20:56:23 +00:00

cmds

Reapply: Add generated source dependency for Jack compilation.

2014-12-13 23:09:56 -08:00

core

am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4

2014-12-17 21:55:05 +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 2dbb8e13: am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent to avoid horizontal scroll bug: 18721145" into lmp-docs automerge: b834c72 automerge: 2a53e24 automerge: c6de288

2014-12-17 20:12:23 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev

2014-12-12 22:15:39 +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

resolved conflicts for merge of fd461ede to master

2014-12-17 15:11:30 -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 caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev

2014-12-17 20:27:39 +00:00

native

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

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

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

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 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev

2014-12-17 19:39:49 +00:00

policy

am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"

2014-12-17 21:51:40 +00:00

Fix typo with register native allocation.

2014-12-16 10:13:05 -08:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev

2014-12-17 21:28:11 +00:00

telecomm/java

Pass onPostDialChar call back from Telephony to Telecom.

2014-12-16 12:53:04 -08:00

telephony/java

am ab4f9976: am ec3f46a5: Merge "IMS OMA-DM Intent and ImsReasonInfo Additions" into lmp-mr1-dev

2014-12-16 19:38:41 +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 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

2014-12-16 17:58:27 +00:00

tools

am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

2014-12-16 18:03:35 +00:00

wifi/java/android/net/wifi

New Additions to WifiScanner APIs

2014-12-15 11:14:45 -08: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%