frameworks_base

Go to file

Jayachandran C 1fd2abcf1d resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp

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

2018-11-08 13:13:58 -08:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "[Call Screening]Logging of calls blocked by call blocking feature, call screening app." am: b5e8d45245

2018-11-08 10:07:13 -08:00

cmds

Merge "Log the thermal throttling event to enable conditional temperature pulling." into pi-dev

2018-11-07 15:26:53 -08:00

config

Merge "Add some ICU 63 classes into boot image profile" am: 93bf21dad4

2018-11-08 11:56:23 -08:00

core

resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp

2018-11-08 13:13:58 -08: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 "Move some members to the "Q blacklist"." am: f5cf9f24ed

2018-10-24 16:14:06 -07:00

keystore

Merge changes I7070326d,I8346e53c am: 546073a5b6

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

libs

Merge "Disable blending for opaque TextureView" into pi-dev

2018-11-07 13:54:42 -08:00

location

Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed

2018-10-24 16:14:06 -07:00

lowpan

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

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

media

Merge "Add key for sample rate and bits per sample" am: f7c4c728fc

2018-11-03 18:21:30 -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 "Take a context to start setting intent in DreamBackend" into pi-dev

2018-11-07 10:58:55 -08: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 "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47

2018-11-08 05:10:10 -08:00

startop

[view-compiler] Support method declaration and invocation in Dex builder

2018-11-07 00:05:48 +00:00

telecomm

Merge "[Call Screening]Logging of calls blocked by call blocking feature, call screening app." am: b5e8d45245

2018-11-08 10:07:13 -08:00

telephony

resolve merge conflicts of c4555ee941 to pi-dev-plus-aosp

2018-11-08 13:13:58 -08: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 "Add skip464xlat test in Nat464XlatTest" am: aef8fe0d47

2018-11-08 05:10:10 -08:00

tools

Allow implicit-fallthrough warnings locally.

2018-10-22 09:56:12 -07:00

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

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

wifi

Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed

2018-10-24 16:14:06 -07:00

Android.bp

Merge "Remove sun.... libcore classes from light grey/vendor lists" am: 65b79f96cd

2018-11-05 06:14:19 -08:00

Android.mk

Merge "Merge hidden API metadata into a single CSV file."

2018-10-17 09:20:04 +00: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

…

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%