frameworks_base

Go to file

Tao Bao 0d27729dd8 resolve merge conflicts of 6d8886a to master.

Change-Id: If8798a1d87b35e2db56211bf0e7dea94bed91b6a

2015-02-12 11:26:00 -08:00

api

am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev

2015-02-12 07:49:31 +00:00

cmds

Am command to split a stack.

2015-02-11 14:02:19 -08:00

core

resolve merge conflicts of 6d8886a to master.

2015-02-12 11:26:00 -08:00

data

Move Noto Sans Tai Le to the end of the font fallback list.

2015-02-11 15:45:49 -08:00

docs

am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c automerge: accf077

2015-02-10 21:01:45 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

Prevent temp rect reuse across methods in LayerDrawable

2015-02-10 16:39:46 -08:00

include

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 23:34:35 +00:00

keystore

Merge "Remove DSA support from Android KeyStore and KeyChain."

2015-01-16 16:44:22 +00:00

libs

Fix Glop vertex alpha blending

2015-02-09 19:08:02 -08:00

location

Update handling of enum/flag fields in GPS data structures.

2015-02-11 13:16:28 -08:00

media

Merge "media: discard duplicate CEA-608 ctrl code"

2015-02-11 02:35:08 +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

Rewrite of the settings provider.

2015-02-11 17:58:22 -08:00

am 2a3cdf57: Merge "Implement array types"

2015-02-10 01:44:11 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev

2015-02-12 07:51:11 +00:00

telecomm/java

Merge "Unhide telecom APIs needed by Contacts"

2015-02-05 18:25:52 +00:00

telephony/java

GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 automerge: 6b27472

2015-02-11 03:52:52 +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

Eliminate groupId and add task to AppWindowToken

2015-01-27 13:56:20 -08:00

tools

Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."

2015-02-11 14:01:36 +00:00

wifi/java/android/net/wifi

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 automerge: 0a22d43

2015-01-29 05:04:48 +00:00

Android.mk

Add ProcessInfoService to activity manager.

2015-01-30 16:58:14 -08:00

CleanSpec.mk

Split up android.policy into framework.jar and services.jar 1/3

2015-02-10 14:56:02 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove DefaultHostnameVerifier from preloaded-classes.

2014-12-04 09:41:46 -08:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%