frameworks_base

Go to file

Chris Thornton 94869bfae6 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: 6e3449b33f

am: 6f2bd8f029

* commit '6f2bd8f0296a2ba075394847f5e62083a641cdef':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: If42bd0ca41d745136f986dcdd29560766a72af84

2016-05-06 18:20:14 +00:00

api

Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e am: ecab71c9f7

2016-05-06 12:29:01 +00:00

cmds

resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp

2016-04-27 13:16:17 -07:00

core

Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: 6e3449b33f

2016-05-06 18:20:14 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:24:11 +00:00

docs

Merge "Add vanity url for bg optimations." into mnc-mr-docs am: d4c3473906 am: 4521e4e605

2016-05-06 02:24:40 +00:00

drm

…

graphics

Merge "Count native allocation for VD against Java heap" into nyc-dev

2016-05-03 16:41:20 +00:00

include

ZipUtils: Fix wrong timestamps when getEntryInfo

2016-04-28 15:07:34 +00:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Merge "Add layer tracing tags in new pipeline" into nyc-dev am: f8892359b0 am: 85bf1a85bd

2016-05-05 20:20:48 +00:00

location

Fixed the sign error in GnssClock

2016-04-08 14:10:42 -07:00

media

Update MIDI package summary am: 15a9a35bee am: c1b551aba6 am: fad0efcdb9

2016-05-06 06:22:01 +00:00

native

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 878dfb2dea" into nyc-mr1-dev-plus-aosp

2016-05-06 17:41:47 +00:00

proto

PackageManager : Log stats about the optimizing apps dialog.

2016-05-05 12:24:09 +01:00

Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev

2016-04-22 19:52:18 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp

2016-05-06 17:41:55 +00:00

telecomm/java

Merge "[Call Timing] Add constants for call timing extras" into nyc-dev

2016-04-18 22:36:40 +00:00

telephony/java

Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce28

2016-05-06 03:36:40 +00:00

test-runner

Disallow disable of the system shared libs.

2016-04-13 19:31:40 -07:00

tests

Merge "allow optionally skipping of initial launch" into nyc-dev

2016-05-06 04:56:19 +00:00

tools

Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac

2016-05-05 19:57:27 +00:00

wifi/java/android/net/wifi

WifiConfiguration: Add new selection disable reasons

2016-05-03 22:27:53 +00:00

Android.mk

Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp

2016-05-02 19:48:56 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%