frameworks_base

Go to file

Scott Main cf3bd00953 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 am: e8d16b29c3 am: 103ba00c99

am: c288c6f149

* commit 'c288c6f149894a97fe6427d94a6bfd374cb61f53':
  update banner to 2.1 and remove yellow

Change-Id: Ia5cbdbb19cbec83470e20d62687889de78968062

2016-05-12 19:42:43 +00:00

api

Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f am: 2fc6bf3936

2016-05-12 17:29:11 +00:00

cmds

Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev

2016-05-06 21:42:47 +00:00

core

Merge "Remove @Nullable from primitive/void types."

2016-05-12 18:53:05 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:24:11 +00:00

docs

Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd

2016-05-12 19:34:30 +00:00

drm

…

graphics

Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev

2016-05-12 00:34:16 +00:00

include

Resource shared libraries: fix theme references

2016-05-10 10:45:52 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Merge "Move gl calls from PatchCache to MeshState"

2016-05-12 01:22:14 +00:00

location

Fixed the sign error in GnssClock

2016-04-08 14:10:42 -07:00

media

stephenli Manually merge commit '68fffa5'

2016-05-12 02:10:33 +00:00

native

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: 2e0e23b684

2016-05-12 19:22:02 +00:00

proto

resolve merge conflicts of 407c434 to nyc-mr1-dev

2016-05-12 12:45:29 -04:00

Merge "[RenderScript] Interrupt mMessageThread when tearing down context." am: 9f2a1979a7

2016-05-11 19:32:00 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 am: ea84ad75d3

2016-05-12 19:07:13 +00:00

telecomm/java

Add removeExtras(String...) prototype per API review.

2016-05-10 14:52:33 -07:00

telephony/java

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:23:26 +00:00

test-runner

Disallow disable of the system shared libs.

2016-04-13 19:31:40 -07:00

tests

Merge "Remove @Nullable from primitive/void types."

2016-05-12 18:53:05 +00:00

tools

Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5 am: 04b0d780bc

2016-05-11 16:04:17 +00:00

wifi/java/android/net/wifi

resolve merge conflicts of cbf3759 to master

2016-05-09 17:46:50 -07:00

Android.mk

Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp

2016-05-02 19:48:56 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%