frameworks_base

Go to file

Victor Chang a0e421d4e9 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 1e93177121

am: 8dda22449b

* commit '8dda22449b47ff3f9fa22c8ee790baaa502ef610':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: Ibb8312c7e8b5920ecd4790882ba63c132b913a47

2016-05-23 12:09:32 +00:00

api

Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: 76d3d8590d

2016-05-23 02:44:34 +00:00

cmds

Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev

2016-05-19 21:01:30 +00:00

core

Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 1e93177121

2016-05-23 12:09:32 +00:00

data

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

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

docs

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

2016-05-20 15:39:38 +00:00

drm

…

graphics

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +00:00

include

Performance improvements in AssetManager

2016-05-20 15:04:09 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

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

libs

Merge "Performance improvements in AssetManager" into nyc-dev am: 3765d34d36 am: 2b798a2344

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

location

Mapping up/down of legacy Gps vs. Gnss Status

2016-05-19 09:55:42 -07:00

media

Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: 79108f18bf

2016-05-20 21:11:07 +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 "Import translations. DO NOT MERGE" into nyc-dev

2016-05-22 23:22:29 +00:00

proto

Add Tron Logging to Keyboard Shortcuts Helper

2016-05-18 15:39:24 +01:00

Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

2016-05-19 22:24:27 +00:00

samples/training/network-usage

…

sax

…

services

Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 1e93177121

2016-05-23 12:09:32 +00:00

telecomm/java

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

2016-05-20 16:01:00 +00:00

telephony/java

Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev

2016-05-20 22:21:26 +00:00

test-runner

Disallow disable of the system shared libs.

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

tests

Create frameworks-base-testutils lib

2016-05-19 13:12:09 -07:00

tools

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

wifi/java/android/net/wifi

Merge "WifiManager: add WIFI_MODE_NO_LOCKS_HELD"

2016-05-20 18:36:23 +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%