frameworks_base

Go to file

Fabian Kozynski bae081d202 DO NOT MERGE resolve merge conflicts of c6a1cfda93 to pi-dev-plus-aosp

Change-Id: I1a18690e85f66ff2a25329f9a050cb038fc0bcfb
Bug: None
Test: I solemnly swear I tested this conflict resolution.

2018-10-17 10:30:00 -04:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

2018-05-15 15:06:19 -07:00

api

Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c

2018-10-16 18:06:09 -07:00

cmds

Merge "Fix implicit fallthrough warnings." am: 012692be3f

2018-10-12 18:05:24 -07:00

config

Remove libcore/io members from light grey list

2018-10-16 14:30:18 +01:00

core

Merge "Network-related commands porting" am: 9b20115264

2018-10-16 02:19:35 -07:00

data

Add READ_PRIVILEGED_PHONE_STATE to used permissions

2018-10-08 11:29:03 -07:00

docs

Camera: update tonemap image in html doc

2018-06-07 10:42:39 -07:00

drm

Stop using Arrays.checkOffsetAndCount.

2018-05-16 07:11:54 -07:00

graphics/java/android

Merge "[Graphics] Align Display P3 transfer function coefficients." am: fde18facba

2018-10-16 11:26:55 -07:00

keystore

Merge changes I7070326d,I8346e53c am: 546073a5b6

2018-10-11 13:51:49 -07:00

libs

Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3

2018-10-15 21:25:35 -07:00

location

Add the metalava_enabled property

2018-10-04 14:27:37 +09:00

lowpan

Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62

2018-04-04 17:56:57 -07:00

media

Merge "Build com.android.media.remotedisplay with java_sdk_library" am: 1ad4aed0b9

2018-10-14 18:57:12 -07:00

native

Use multiple patterns and/or emails in per-file syntax.

2018-08-23 14:35:37 -07:00

nfc-extras

Add api txt files for nfc-extras

2018-05-12 22:36:10 +09:00

obex

Build java.obex with java_sdk_library

2018-05-30 00:19:01 +00:00

opengl/java

Add @UnsupportedAppUsage annotations

2018-08-17 15:32:35 +01:00

packages

DO NOT MERGE resolve merge conflicts of c6a1cfda93 to pi-dev-plus-aosp

2018-10-17 10:30:00 -04:00

proto

Merge "proto change for wifi link layer usage stats" into pi-dev

2018-10-10 13:25:43 -07:00

Merge "Add @UnsupportedAppUsage annotations"

2018-08-06 09:38:58 -07:00

samples/training/network-usage

…

sax

Merge "Move XML object factory logic to libcore"

2018-07-12 11:26:03 -07:00

services

Merge "audio: apply volume upon hearing aid device connection" into pi-dev

2018-10-16 18:17:20 -07:00

startop

Merge "iorap: Remove blank newline in TEST_MAPPING"

2018-10-17 01:50:35 +00:00

telecomm

Merge "Telephony light grey list clean up for Q" am: b9749f750f

2018-10-15 16:02:42 -07:00

telephony

Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c

2018-10-16 18:06:09 -07:00

test-base

Add the metalava_enabled property

2018-10-04 14:27:37 +09:00

test-legacy

Build android.test.* with java_sdk_library

2018-08-29 12:22:59 +09:00

test-mock

Add the metalava_enabled property

2018-10-04 14:27:37 +09:00

test-runner

Add the metalava_enabled property

2018-10-04 14:27:37 +09:00

tests

Merge "Build com.android.media.remotedisplay with java_sdk_library"

2018-10-14 18:48:01 -07:00

tools

Merge "Stop using DIST_DIR directly, use dist-for-goals instead"

2018-10-16 17:43:35 -07:00

resolve merge conflicts of 606d3975b2 to stage-aosp-master

2018-08-06 16:30:26 +01:00

wifi

Merge "Remove usage of StringFactory" am: 8a79748b0c

2018-10-10 14:56:56 -07:00

Android.bp

Merge "Enable lint_as_errors for frameworks/base docs" am: 6622d0957d

2018-10-12 19:00:45 -07:00

Android.mk

Add new "max-sdk-p blacklist".

2018-10-15 16:38:12 +01:00

CleanSpec.mk

Build com.android.media.remotedisplay with java_sdk_library

2018-10-02 13:35:49 +09:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Remove Support Library from frameworks/base pathmap.mk

2018-02-15 11:37:52 -05:00

PREUPLOAD.cfg

Upload hook that guides people towards AOSP.

2018-09-11 11:09:05 -06:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%