frameworks_base

Go to file

Adam Lesinski 28468efe50 Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac

am: 3bd94c3e8a

* commit '3bd94c3e8a34ad328125783973e5d523eb36f000':
  BatteryStats: Keep track of coulomb counter

Change-Id: I3c0bc2e5ddd001a57978fe58f7d4bd511e8a8499

2016-04-30 02:31:26 +00:00

api

Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea am: 573042aab2

2016-04-28 19:33:03 +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 "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac

2016-04-30 02:31:26 +00:00

data

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

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

docs

Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs am: 8d21a984a6 am: 935c4835ac

2016-04-29 17:39:04 +00:00

drm

…

graphics

Merge "Video source test & bugfix" into nyc-dev

2016-04-29 14:49:13 +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 "Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3 am: 88e7238235" into nyc-mr1-dev-plus-aosp

2016-04-29 15:05:41 +00:00

location

Fixed the sign error in GnssClock

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

media

Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am: 3c6736b078 am: a8499e4558

2016-04-30 00:45:11 +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 "Fix DirectReply taking too long in HUNs" into nyc-dev am: 3c37f6ed06 am: 7419ad3fae

2016-04-29 21:42:19 +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 "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac

2016-04-30 02:31:26 +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 "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0

2016-04-26 23:16:18 +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

Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev am: 398342f9b6 am: e13a3252f9

2016-04-29 21:35:12 +00:00

wifi/java/android/net/wifi

Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b am: 811c48d

2016-04-18 23:45:58 +00:00

Android.mk

Merge "Fix API review comments, add remove callback." into nyc-dev am: d19191d am: 1b65983

2016-04-28 05:49:29 +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%