frameworks_base

Go to file

Narayan Kamath d02a898528 resolved conflicts for merge of f44fdaed to master

Change-Id: I324b252123b7fc4a38aad9be4b986cb564a17b14

2014-12-16 10:57:05 +00:00

api

am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a

2014-12-10 21:59:42 +00:00

cmds

Reapply: Add generated source dependency for Jack compilation.

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

core

am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee

2014-12-16 01:53:20 +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

resolved conflicts for merge of f44fdaed to master

2014-12-16 10:57:05 +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

Fix style

2014-12-12 09:49:29 -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 d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

2014-12-13 23:55:40 +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-15 15:11:37 +00:00

policy

am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev

2014-12-15 22:41:50 +00:00

am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev

2014-12-13 00:15:08 +00:00

samples/training/network-usage

…

sax

…

services

am 9900dbb9: am a00be9b4: Remember failed dexopt to avoid retry automerge: 2350c7c

2014-12-16 01:53:25 +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 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

2014-12-15 19:28:43 +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 d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev

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

tools

am 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123

2014-12-16 01:53:14 +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%