frameworks_base

Go to file

Christopher Tate 39b1dd9ec8 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: 36b03ec9f0

am: 1500a27af2

* commit '1500a27af2e4daede64b938cf4207748c283654a':
  Back up / restore the 'mono audio' setting

Change-Id: I6ba6bec20b5be767cd8b97b4ac1fb022ff9be0a5

2016-05-20 17:30:19 +00:00

api

Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev am: 096e99e25c

2016-05-20 17:15:05 +00:00

cmds

Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev

2016-05-19 21:01:30 +00:00

core

Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: 36b03ec9f0

2016-05-20 17:30:19 +00:00

data

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

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

docs

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

2016-05-20 15:39:38 +00:00

drm

…

graphics

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +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

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

location

Mapping up/down of legacy Gps vs. Gnss Status

2016-05-19 09:55:42 -07:00

media

Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 8a53cc9e26

2016-05-17 21:49:21 +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 "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 9734c229d9

2016-05-20 17:19:03 +00:00

proto

Add Tron Logging to Keyboard Shortcuts Helper

2016-05-18 15:39:24 +01:00

Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

2016-05-19 22:24:27 +00:00

samples/training/network-usage

…

sax

…

services

Only broadcast screenshot error to the current user. am: 538c22630b am: 6e95485f50

2016-05-20 17:18:46 +00:00

telecomm/java

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

2016-05-20 16:01:00 +00:00

telephony/java

Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev

2016-05-20 16:52:40 +00:00

test-runner

Disallow disable of the system shared libs.

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

tests

Create frameworks-base-testutils lib

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

tools

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

wifi/java/android/net/wifi

resolve merge conflicts of fb8021c to master

2016-05-18 16:54:29 -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%