frameworks_base

Go to file

Vladislav Kuzkokov 2555a1211d resolve merge conflicts of 852c394 to master

Change-Id: I75562584559c1b11111e316edded61587892ee8b

2016-09-29 01:42:42 +02:00

apct-tests/perftests

Merge "Add usermanager related perf tests - part2"

2016-09-24 01:12:01 +00:00

api

Merge "Rerun of update-api with no changes" am: f0aa998233

2016-09-28 17:55:30 +00:00

cmds

DO NOT MERGE - fix truncated boot sound

2016-09-27 01:35:43 +00:00

core

Merge "Make print core tests junit tests."

2016-09-28 22:54:28 +00:00

data

Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d am: bd25fec0d9

2016-09-23 00:04:19 +00:00

docs

docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. am: b960272cc4 am: 68af2452aa

2016-09-28 20:35:17 +00:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

Expose SurfaceTexture(boolean) constructor

2016-09-23 13:27:55 -07:00

include

Search for runtime resource overlays in subdir. am: 1c15c63578

2016-09-28 10:33:16 +00:00

keystore

docs: Fixed broken link to Android KeyStore facility am: c0c4ac5e35 am: 507a5c03da

2016-09-27 02:06:09 +00:00

libs

Merge "hwui: Fix the length of partial updates system property" am: faf945a773 am: 73f2e9b812 am: 3734e98095

2016-09-28 17:17:00 +00:00

location

docs: Fixed misspelling in "Address" class overview. am: b10a6dc963

2016-09-27 00:00:27 +00:00

media

ExifInterface: Update javadoc for saveAttributes am: abf5b4cbf3 am: d0a8a69034 am: 6e8eba7238

2016-09-28 00:27:20 +00:00

native

Move libjnigraphics to ndk_library.

2016-09-27 13:59:05 -07:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-29 22:36:15 +00:00

opengl/java

Merge \"Merge \\"update GlSurfaceView:onPause/Resume docs\\" into nyc-mr1-dev am: ee557b2b99\" into nyc-mr1-dev-plus-aosp

2016-07-01 22:09:47 +00:00

packages

Merge "Ensure the connected device indicator disappears if bluetooth is turned off."

2016-09-28 21:22:12 +00:00

proto

Add metrics constant for dialogs in Settings.

2016-09-23 13:02:35 -07: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 852c394 to master

2016-09-29 01:42:42 +02:00

telecomm/java

Fix potential NPE in RemoteConnection. am: 9c2c583ad7

2016-09-21 20:11:29 +00:00

telephony/java

Merge "Add key to CarrierConfig" am: 154c22d2d4 am: fda7370ddd

2016-09-27 22:34:16 +00:00

test-runner

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

2016-08-02 23:56:55 +00:00

tests

Merge "Handle the case where window position comes before view map"

2016-09-17 02:05:01 +00:00

tools

Merge "Added building libaapt2_jni.so."

2016-09-27 21:33:56 +00:00

wifi/java/android/net/wifi

Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210 am: 62bceaabe9 am: fd033a47e9

2016-09-28 20:54:56 +00:00

Android.bp

Move libjnigraphics to ndk_library.

2016-09-27 13:59:05 -07:00

Android.mk

[DO NOT MERGE] Use tokens instead of account access trackers am: 32bfb594af

2016-09-27 20:59:00 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Fix a bunch of repeated reads of a ro.* property

2016-09-21 16:10:54 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%