frameworks_base

Go to file

Jeff Sharkey 2f8f394b14 resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp

Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451

2014-12-01 11:57:09 -08:00

api

Add flag for wiping factory reset protection data.

2014-11-25 20:48:41 +00:00

cmds

am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"

2014-11-25 19:03:57 +00:00

core

am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev

2014-12-01 19:47:58 +00:00

data

am fa910081: am 461eaf79: Merge "Add keylayout for Logitech RedHawk Gamepad"

2014-12-01 05:27:15 +00:00

docs

am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs

2014-12-01 19:32:31 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev

2014-11-26 18:41:06 +00:00

include

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

keystore

Track change to Conscrypt

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

libs

am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

2014-11-26 21:02:24 +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

am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev

2014-12-01 19:47:58 +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 c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev

2014-12-01 19:48:42 +00:00

policy

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

2014-11-30 21:16:39 -08:00

Fix format strings mismatching the parameters passed to them

2014-11-20 15:24:46 -08:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev

2014-12-01 19:48:36 +00:00

telecomm/java

Telecom API updates (1/6)

2014-11-28 15:54:35 -08:00

telephony/java

am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev

2014-12-01 19:32:06 +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 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev

2014-11-21 23:07:08 +00:00

tools

am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df

2014-11-21 10:17:00 +00:00

wifi/java/android/net/wifi

am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev

2014-11-26 20:02:35 +00:00

Android.mk

Make IKeyguardService interface asynchronous

2014-11-25 23:22:52 +01: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%