frameworks_base

Go to file

Geoff Mendal 94f01a767a am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

automerge: 2f5e130  -s ours

* commit '2f5e130d4d16eb80e72e492230dec843e1d2c9b2':
  Import translations. DO NOT MERGE

2014-12-10 19:19:18 +00:00

api

Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev

2014-12-10 16:56:15 +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 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev

2014-12-10 19:17:53 +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 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs

2014-12-10 19:03:32 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

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

2014-12-09 15:38:38 -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 fe11126d to lmp-mr1-dev-plus-aosp

2014-12-09 15:38:38 -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

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

…

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 12:37:04 -08:00

samples/training/network-usage

…

sax

…

services

am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev

2014-12-10 19:06:50 +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 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev

2014-12-09 20:34:48 +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%