Fabian Kozynski f8e0c6ebca [automerger skipped] DO NOT MERGE resolve merge conflicts of c6a1cfda93 to pi-dev-plus-aosp ...

am: bae081d202  -s ours

Change-Id: I604ad31279cb133446327890f516becb3774714d

2018-10-17 09:51:11 -07:00

apct-tests/perftests

Perf test to measure various mechanisms to track CPU.

2018-10-08 13:52:46 +01:00

api

Merge "Revert "refactor radioPowerstate""

2018-10-17 11:04:14 +00:00

cmds

Merge "Snapshot memory state for some native processes"

2018-10-17 16:30:55 +00:00

config

Merge "Remove libcore/io members from light grey list" am: 2579dcd17e am: 1e69440dff

2018-10-16 11:44:33 -07:00

core

Merge "Snapshot memory state for some native processes"

2018-10-17 16:30:55 +00:00

data

Merge "Add READ_PRIVILEGED_PHONE_STATE to used permissions" am: 403813782f am: 25131f86fa

2018-10-10 19:30:36 -07:00

docs

…

drm

…

graphics/java/android

Merge "Refactor the nativePtr validation code to a method."

2018-10-16 22:04:51 +00:00

keystore

Merge changes I7070326d,I8346e53c am: 546073a5b6 am: 11e9a86034

2018-10-11 14:07:01 -07:00

libs

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

2018-10-15 22:05:59 -07:00

location

Add Doc and nullability to LocationManager#getNetworkProviderPackage

2018-10-08 16:37:06 -07:00

lowpan

…

media

Merge "MediaPlayer2: remove hidden api, setMetadataFilter and getMetadata"

2018-10-17 02:28:15 +00:00

native

Read OEM customization XML

2018-10-01 23:08:23 -07:00

nfc-extras

…

obex

…

opengl/java

Add @UnsupportedAppUsage annotations

2018-08-17 15:23:54 +01:00

packages

Merge "Set EXTRA_USER instead of EXTRA_USER_ID for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"

2018-10-17 00:26:37 +00:00

proto

Merge "Add metric id for mobile network settings"

2018-10-12 18:27:40 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Snapshot memory state for some native processes"

2018-10-17 16:30:55 +00:00

startop

Merge "iorap: Remove blank newline in TEST_MAPPING" am: 22fe21df93 am: cbe655e781

2018-10-16 21:12:30 -07:00

telecomm

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

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

telephony

Merge "Revert "refactor radioPowerstate""

2018-10-17 11:04:14 +00:00

test-base

Add the metalava_enabled property

2018-10-02 01:50:09 +00:00

test-legacy

Build android.test.* with java_sdk_library

2018-08-16 12:16:28 +09:00

test-mock

Merge "Add Context.getDisplayId() to avoid possible IPC"

2018-10-16 00:20:52 +00:00

test-runner

Add the metalava_enabled property

2018-10-02 01:50:09 +00: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" am: a8f2601d28 am: 9b767e275e

2018-10-16 18:01:26 -07:00

wifi

Merge "Moved WifiWakeReasonAndCounts.java out of base/wifi"

2018-10-15 17:08:18 +00:00

Android.bp

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

2018-10-12 19:14:57 -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-08-30 16:06:54 +09:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Enable checkstyle repo upload hook for tests

2018-09-24 13:10:19 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%