frameworks_base

Go to file

Michal Karpinski 14f57541b4 resolve merge conflicts of 970525ef32 to master

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

2017-04-26 11:55:02 +01:00

apct-tests/perftests

Move SystemPerfTest out of java.* namespace

2017-02-28 10:44:04 -08:00

api

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev

2017-04-26 08:16:53 +00:00

cmds

Merge changes from topic 'virtual-display-api' into oc-dev am: 13ba34bf37

2017-04-24 22:45:33 +00:00

core

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev

2017-04-26 08:16:53 +00:00

data

Merge "Revert "Whitelist DMAgent from bg check"" into oc-dev am: 730bf42e44

2017-04-25 20:22:51 +00:00

docs

docs: Restoring file to allow staging reference docs from Gerrit

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

drm

Properly guard access to CloseGuard in finalizers.

2017-04-03 18:12:04 +01:00

graphics/java/android

Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a

2017-04-26 00:39:15 +00:00

keystore

Merge "Fix some issues found by new doclava linter." into oc-dev

2017-04-25 22:11:01 +00:00

legacy-test

Fix build failure when using javac toolchain

2017-02-22 14:42:46 +00:00

libs

Merge "Fix include" into oc-dev am: 7e44951bb7

2017-04-26 01:04:02 +00:00

location

Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG: 36552859" into oc-dev am: 500c1d0749

2017-04-19 01:46:47 +00:00

media

Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev am: a35e4e5584

2017-04-26 01:22:38 +00:00

native

Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle

2017-04-17 08:55:24 -07:00

nfc-extras

Prepare for removal of legacy-test from default targets

2017-01-18 16:39:34 +00:00

obex

OBEX: Set Min maxPacketLength negotiated in CONNECT Operation.

2017-02-03 21:47:39 +00:00

opengl/java

Workaround apps that override surfaceCreated

2017-04-21 17:14:45 -07:00

packages

Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev am: 21fb35048f

2017-04-25 21:44:33 +00:00

proto

Merge "Added metrics key for camera lift trigger."

2017-04-25 20:43:59 +00:00

Merge "Validates Intrinsic Blur only takes 2D Allocations" am: b44f4d2f51 am: 0962a6e83c am: cfe40aa165

2017-04-20 23:04:07 +00:00

samples/training/network-usage

Remove unnecessary casts on calls to findViewById

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

sax

Prepare for removal of legacy-test from default targets

2017-01-18 16:39:34 +00:00

services

resolve merge conflicts of 970525ef32 to master

2017-04-26 11:55:02 +01:00

telecomm/java

Merge "More auto-doc work." into oc-dev am: 6bc03748a7

2017-04-24 18:37:08 +00:00

telephony/java

Merge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9 am: 65030630fd

2017-04-26 00:49:07 +00:00

test-runner

Merge "Address API review comments for registerReceiver" into oc-dev

2017-04-20 19:52:51 +00:00

tests

Merge "Revert "Revert "Integrate new looper apis into testables""" into oc-dev am: 21fb35048f

2017-04-25 21:44:33 +00:00

tools

Merge "Update fontchain to read from additional sequences" into oc-dev am: a54b89e000

2017-04-25 19:53:18 +00:00

wifi

Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am: 2fd19ffa06 am: 3c6305cc55 am: 887fd90742

2017-04-25 13:46:42 +00:00

Android.bp

…

Android.mk

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev

2017-04-26 08:16:53 +00:00

CleanSpec.mk

Clean spec to deal with rename of auto_fill to autofill

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

compiled-classes-phone

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Move framework-specific portions of pathmap.mk into frameworks/base

2017-03-03 16:18:32 +00:00

preloaded-classes

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00

PREUPLOAD.cfg

…

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%