frameworks_base

Go to file

Felipe Leme 18d6db9a68 resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp

am: 80f0d0f2a4

Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8

2016-06-21 21:35:16 +00:00

api

Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a08

2016-06-21 17:25:21 +00:00

cmds

Merge \\"Let bmgr inspect the set of whitelisted transports\\" into nyc-dev am: 0f101342e1

2016-06-20 17:54:15 +00:00

core

resolve merge conflicts of 83b1a18 to master

2016-06-21 13:56:01 -07:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a

2016-06-01 23:02:47 +00:00

docs

Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am: 07340a654a

2016-06-21 11:55:54 +00:00

drm

…

graphics

Merge \\\"Only block invalidation in DrawableContainer initialization\\\" into nyc-dev am: 7a372a13af am: 9b81f5bfaf

2016-06-21 14:04:55 +00:00

include

Move matching Tagalog and Filipino to ResourceTypes.cpp

2016-06-15 11:45:58 -07:00

keystore

More thorough cleansing of expired users

2016-06-15 11:32:16 -07:00

libs

HWUI: move microbench to APCT infrastructure

2016-06-20 22:39:26 +00:00

location

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

media

Merge "MediaBrowserService: Fix ConcurrentModificationException"

2016-06-20 23:56:14 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

Correct spelling error in GLSurfaceView.

2016-06-07 16:10:40 -07:00

packages

resolve merge conflicts of 83b1a18 to master

2016-06-21 13:56:01 -07:00

proto

Merge \\"Add metrics for button taps in Settings support tab.\\" into nyc-mr1-dev am: 03e387e5b5

2016-06-21 15:47:24 +00:00

Merge \\"Delete simple reduction implementation.\\" into nyc-dev am: d749245b88

2016-06-13 22:20:32 +00:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp

2016-06-21 21:35:16 +00:00

telecomm/java

Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53

2016-06-15 22:57:14 +00:00

telephony/java

Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a08

2016-06-21 17:25:21 +00:00

test-runner

Un-deprecated Android mock testing APIs

2016-05-25 22:54:27 +00:00

tests

Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032

2016-06-17 20:42:14 +00:00

tools

Avoid radius 0 gradient painting

2016-06-21 14:48:13 +00:00

wifi/java/android/net/wifi

Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4

2016-06-17 20:42:09 +00:00

Android.mk

Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4

2016-06-17 20:42:09 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2016-06-06 14:58:44 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%