frameworks_base

Go to file

Etan Cohen dae51db3cc reolve merge conflicts of 4e3d827 to nyc-mr1-dev-plus-aosp

am: 51a6ca483f

Change-Id: Iea1d75ffbb79f9e5012b67f731ce23bcb993781c

2016-09-16 20:04:05 +00:00

apct-tests/perftests

Merge changes from topic 'ksk_long_text_edit'

2016-09-08 04:37:17 +00:00

api

Merge "Add Notification channels"

2016-09-16 15:35:27 +00:00

cmds

Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." am: 796578f9a9 am: 2b283bd24f am: c9f86e1256

2016-09-14 20:26:10 +00:00

core

Merge "Collect status on uncrypt time cost" am: bc19e00d35 am: 79d27bdeac am: 1579ce8a1d

2016-09-16 18:52:28 +00:00

data

Fix incorrect emoji presentation for 'Zsym' script

2016-09-14 10:30:59 +09:00

docs

docs: Add docs on OnboardingFragment am: d64f8bfe1f am: 1fff868293

2016-09-15 18:31:13 +00:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

Merge "Add API to copy a window"

2016-09-08 16:23:45 +00:00

include

…

keystore

Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev am: 6acd5e7361 am: 2f6eecbed0

2016-08-23 22:29:15 +00:00

libs

Ignore HasAlphaLayer flag to fix b/30929229 am: 83427ff222 am: df6b413b63

2016-09-15 14:09:37 +00:00

location

…

media

MediaPlayer: add comments of restriction for setNextMediaPlayer. am: 295e727545 am: bff3f8a337

2016-09-16 01:55:45 +00:00

native

Merge "Enable clang for arm64."

2016-08-04 17:19:10 +00:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-29 22:36:15 +00:00

opengl/java

…

packages

Merge "Delete TakeScreenshotTest"

2016-09-16 18:54:34 +00:00

proto

Add metrics constant for Managed provisioning

2016-09-15 11:01:26 +01:00

…

samples/training/network-usage

…

sax

…

services

Merge "Don't include default config in bugreport."

2016-09-16 19:11:58 +00:00

telecomm/java

Add toString method for session event codes.

2016-09-02 09:55:25 -07:00

telephony/java

Merge "Add dial_string_replace key to CarrierConfig"

2016-09-15 22:53:56 +00:00

test-runner

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

2016-08-02 23:56:55 +00:00

tests

Remove redundant code am: 4ebc5986a8 am: 82907dfd36

2016-09-02 20:42:45 +00:00

tools

Handle the case where there is no clip defined

2016-09-15 12:01:33 +00:00

wifi/java/android/net/wifi

Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84e6d0d am: d8a5904abe am: cb38f6fbb8

2016-09-14 05:30:13 +00:00

Android.mk

remove 'useUpdatedTemplates' flag that's no longer supported. Fix build. am: 7dd9749246 am: ff8cb50979 am: 3578867216 am: 1696dcd4b4

2016-09-03 01:51:07 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Ensure apps cannot prevent uncaught exceptions being logged."

2016-08-09 09:02:27 +00:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%