frameworks_base

Go to file

Ryan Prichard 0689e2121f [automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p2" am: c9fc995e0e

am: 66e6f61bb1  -s ours

Change-Id: I0d25991f2e47b05df6039d7ebdb1b4575e591d8c

2018-09-06 14:51:47 -07:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "Make SubscriptionManager.getSubId public"

2018-09-06 20:06:02 +00:00

cmds

Merge "statsd: fix double close." am: 0b8f17b3ba

2018-09-05 12:34:31 -07:00

config

Delete hiddenapi-p-light-greylist.

2018-08-31 13:38:38 +01:00

core

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a4189 am: 1f5050c054 am: 4fda414ed6

2018-09-05 20:59:25 -07:00

data

Merge changes I02362055,I8ab46fde am: 6d9bf6a207

2018-09-05 09:25:16 -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 "Add @UnsupportedAppUsage annotations" am: 9137ecafbd

2018-08-30 09:10:27 -07:00

keystore

Merge "Added check for misprovisioned Pixel 2 device." into pi-dev

2018-08-24 11:21:06 -07:00

libs

Merge changes Ie072511b,I6424f90c

2018-08-24 15:38:07 -07:00

location

Merge "Add @UnsupportedAppUsage annotations" am: df82ab2de2

2018-08-22 07:18:53 -07:00

lowpan

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

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

media

Merge "Convert AudioAttribute to Stream correctly" am: 024387744a

2018-09-05 17:31:28 -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

Merge "Add process-lifecycle-owner-initializer to tests."

2018-09-05 23:03:36 +00:00

proto

resolve merge conflicts of 882f4e1f44 to pi-dev-plus-aosp

2018-08-30 10:39:15 +00: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 "DO NOT MERGE: Reset launch start times when removing a process" into pi-dev

2018-09-06 12:23:42 -07:00

telecomm

Merge "Call Redirection Surface in Telecom out going call flow"

2018-08-31 17:36:01 -07:00

telephony

Merge "Make SubscriptionManager.getSubId public"

2018-09-06 13:26:59 -07:00

test-base

Build android.test.* with java_sdk_library

2018-08-29 16:22:00 +09:00

test-legacy

Build android.test.* with java_sdk_library

2018-08-29 16:22:00 +09:00

test-mock

Build android.test.* with java_sdk_library

2018-08-29 16:22:00 +09:00

test-runner

Build android.test.* with java_sdk_library

2018-08-29 16:22:00 +09:00

tests

Convert sysui to bp

2018-09-05 13:57:10 -07:00

tools

Merge "Fix compilation when targeting OpenJDK 9."

2018-09-06 12:31:56 -07:00

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

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

wifi

Merge "Fix some fields in WifiInfo are not written into Parcel" am: 5add10333d

2018-08-29 18:05:35 -07:00

Android.bp

Merge "Processor for @UnsupportedAppUsage annotations." am: e5440456ca

2018-09-05 09:43:35 -07:00

Android.mk

Rewrite hidden API list generation in Python

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

CleanSpec.mk

Merge "Build com.android.future.usb.accessory with java_sdk_library"

2018-06-28 20:38:09 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Add presubmit hook for hidden API lists.

2018-05-08 10:29:50 +01:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%