frameworks_base

Go to file

Dianne Hackborn 4e1fa3c476 resolve merge conflicts of a14aac9 to master

Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923

2016-05-04 16:53:38 -07:00

api

Merge "Marking @SystemApi permissions @hide too." into nyc-dev am: 441da79d8a am: 8f04f5f3ba

2016-05-04 22:30:19 +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

resolve merge conflicts of a14aac9 to master

2016-05-04 16:53:38 -07:00

data

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

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

docs

Merge "docs: Skeletal N-DP3 release notes" into mnc-io-docs am: 6cf7d79db2

2016-05-04 22:38:47 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

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

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

include

Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" am: 3f0355f

2016-04-28 12:26:53 +00:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

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

libs

Merge "Update nullegl to support swapbuffers with damage"

2016-05-04 16:50:53 +00:00

location

Fixed the sign error in GnssClock

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

media

Revert "TIF: add signal detection feature for HW inputs"

2016-05-04 21:43:40 +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

OBEX: Handle GET operation properly

2015-05-16 01:19:19 +00:00

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev am: 12b1776dde am: 6767c46420

2016-05-04 22:33:45 +00:00

proto

Add Tron logging for open/close App Disambig

2016-04-29 17:28:04 +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 "Revert "Don\'t enforce this API - it\'s not sensitive"" into nyc-dev am: fc0810b4d4 am: f72ea591e6

2016-05-04 23:02:41 +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 "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev am: fc6a3ad85b

2016-05-02 21:52:52 +00:00

test-runner

Disallow disable of the system shared libs.

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

tests

Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3

2016-04-29 15:00:24 +00:00

tools

Fix google-explicit-constructor warnings.

2016-05-03 10:02:51 -07: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

Fix incremental build

2016-03-03 10:19:27 -08:00

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%