frameworks_base

Go to file

Chris Banes 4b201a5731 resolved conflicts for merge of cbc1ac33 to master

Change-Id: I107320a07a1646f2ddc3a288b13ae58c538d96e6

2015-02-18 11:32:48 +00:00

api

DevicePolicy: Make uid parameter an int

2015-02-17 14:18:32 +00:00

cmds

am b1ea8a53: am 2aa2672d: am 627396ac: Merge "Add missing <sys/file.h> include for flock."

2015-02-17 02:09:42 +00:00

core

Merge "Fixed NPE in ResourceManager when Activity.recreate is called."

2015-02-18 03:23:39 +00:00

data

Merge "Move apache specific portions of android.net.http to external/apache-http."

2015-02-13 09:51:44 +00:00

docs

resolved conflicts for merge of cbc1ac33 to master

2015-02-18 11:32:48 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

Add attribute for controlling ripple radius

2015-02-13 11:11:12 -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

Device Policy API to choose a private key silently

2015-02-05 19:38:43 +00:00

libs

Glop SkiaShader support

2015-02-17 15:45:46 -08:00

location

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

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

media

Volume: Allow dialog to query "muteable" streams.

2015-02-17 11:01:51 -05: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

Location settings not properly set.

2015-02-17 21:41:05 -08:00

Revert "Revert "Add BLAS intrinsic.""

2015-02-18 00:44:08 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Save per-user camera policy in different system properties"

2015-02-18 00:20:08 +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

Update voice interaction layer for new UI design.

2015-02-13 11:27:57 -08:00

tools

Merge "More lint tests."

2015-02-18 01:22:48 +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

Move apache specific portions of android.net.http to external/apache-http.

2015-02-12 11:15:49 +00: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%