frameworks_base

Go to file

Jason Monk 826b6094a7 resolve merge conflicts of 1a5e87918e to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f

2017-08-29 11:30:52 -04:00

apct-tests/perftests

Update user perf tests to report only mean.

2017-07-12 18:15:02 -07:00

api

Merge "Adapt ICU 59 API update to Doclava changes." am: e048261656 am: 0fc0cc9dd8

2017-08-29 14:16:18 +00:00

cmds

Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev

2017-08-26 11:33:16 +00:00

config

Add CollationRoot to preloaded classes

2017-08-16 13:58:47 -07:00

core

Merge "Fix GATT client leakage when scan is throttled (1/2)" am: 3cc1ad87f0 am: d019cce887

2017-08-29 08:31:19 +00:00

data

sounds : Add a makefile for Android Go specific sounds.

2017-08-23 19:37:42 +01:00

docs

docs: Restoring file to allow staging reference docs from Gerrit

2017-04-18 14:00:55 -07:00

drm

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

graphics/java/android

Revert "Implement family fallback." DO NOT MERGE

2017-07-26 22:21:14 +00:00

keystore

Merge "docs: corrected code example mistakes" into oc-dev am: 5714da6e93

2017-08-16 17:28:26 +00:00

legacy-test

Repackage com.android.internal.util.Predicate

2017-07-13 12:46:53 +01:00

libs

Merge "Disable hwui blending for first draw to main FBO" into oc-mr1-dev

2017-08-21 20:14:59 +00:00

location

Average of top 4 CNO

2017-07-10 19:00:27 +00:00

lowpan

Revert "Initial support for proposed android.net.lowpan"

2017-08-10 08:56:41 -07:00

media

Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c

2017-08-28 22:47:34 +00:00

native

Merge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307 am: 9424fad097

2017-08-22 19:27:42 +00:00

nfc-extras

Fixed nfc-extras build files

2017-05-23 11:51:15 +01:00

obex

OBEX: Add required parameters TAG ID's for PBAP 1.2

2017-05-20 00:27:31 +00:00

opengl/java

remove unused private field

2017-05-01 10:22:44 -04:00

packages

resolve merge conflicts of 1a5e87918e to oc-mr1-dev-plus-aosp

2017-08-29 11:30:52 -04:00

proto

Log reportFullyDrawn into TRON

2017-08-21 15:35:49 +02:00

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

samples/training/network-usage

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

sax

…

services

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev

2017-08-29 11:41:26 +00:00

telecomm/java

Merge "Emergency redial implementation" am: b3b09849bc am: f5a457244c

2017-08-25 20:56:03 +00:00

telephony/java

Merge "Emergency redial implementation" am: b3b09849bc am: f5a457244c

2017-08-25 20:56:03 +00:00

test-runner

@hide new API

2017-08-11 10:42:14 -07:00

tests

Merge "Trivial change to test expectations."

2017-08-28 12:49:29 +00:00

tools

Merge "Use guava 21.0" am: edb2e0c722 am: f1c99fb47f

2017-08-29 00:38:13 +00:00

Add vr platform lib

2017-05-10 16:54:20 -07:00

wifi

Merge "Use a LruCache in WifiNetworkScoreCache." into oc-mr1-dev

2017-08-25 20:29:32 +00:00

Android.bp

Revert work around clang-tidy segmentation fault.

2017-06-12 09:45:47 -07:00

Android.mk

Revert "Time zone update API classes"

2017-08-12 01:21:10 +00:00

CleanSpec.mk

Clean spec to deal with rename of auto_fill to autofill

2017-03-10 13:02:43 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Enable Checkstyle for "repo upload" for more projects.

2017-08-22 14:03:46 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%