Steve Elliott 7098d46260 [automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev am: d2fa9c3ecf -s ours ...

am: e30c42e456  -s ours

Change-Id: I463ddbc2cf94f52d7b66d6dffb0b0c7233e8dfd3

2018-10-31 15:07:29 -07:00

apct-tests/perftests

Enabled aggregated per-uid stats collection by default

2018-04-20 16:12:41 -07:00

api

Enforce permission check before returning application info

2018-05-31 17:20:14 -07:00

cmds

BootAnimation: Fix boot animation with hidden cutout

2018-08-22 21:37:39 +01:00

config

DO NOT MERGE: Fix signature of KernelCpuProcReader

2018-10-08 16:32:50 +00:00

core

Merge "Be the current user to get A2DP proxy" into pi-dev

2018-10-30 22:22:14 +00:00

data

Fix cts.

2018-06-06 18:08:01 -07:00

docs

Camera: update tonemap image in html doc

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

drm

…

graphics/java/android

Docs: fixed typo

2018-07-27 12:07:27 -07:00

keystore

Added check for misprovisioned Pixel 2 device.

2018-08-24 11:39:20 +00:00

libs

Use bilerp sampling when drawing TextureView with non-translate matrix

2018-10-25 16:28:27 -04:00

location

docs: bug 37130805, typo

2018-10-01 14:38:57 -07:00

lowpan

…

media

AudioService: Add Hearing Aid Switch Control

2018-10-18 13:31:11 -07:00

native

Move registration of AssetManager.mObject to zygote.

2018-05-10 15:00:13 +01:00

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Fix Power Menu vanish when display size is Large" into pi-dev

2018-10-31 02:58:09 +00:00

proto

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

2018-10-10 19:42:55 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev

2018-10-30 19:25:40 +00:00

telecomm

docs: fixing 'mange' instead of 'manage'

2018-10-08 15:57:00 -07:00

telephony

Adding new intent ACTION_SMS_MMS_DB_CREATED.

2018-10-25 15:57:47 -07:00

test-base

…

test-legacy

…

test-mock

Require READ_CALL_LOG permission to see phone numbers in phone state.

2018-04-27 08:44:07 -07:00

test-runner

…

tests

Fix leak where system held onto slice providers

2018-07-03 17:42:05 +00:00

tools

Remove requirement for kiss emoji should have gender

2018-07-19 17:12:02 +00:00

vr

…

wifi

docs: Replacing {#link with {@link

2018-10-04 18:20:51 +00:00

Android.bp

Add stats logging to ServiceManager and NPMS

2018-04-11 16:37:57 -07:00

Android.mk

Include annotations in metalava stubs

2018-07-02 14:06:21 -07:00

CleanSpec.mk

Enforce dump permission in stats service

2018-04-16 15:04:28 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Add presubmit hook for hidden API lists.

2018-04-24 15:15:13 +01:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%