frameworks_base

Go to file

Mathew Inwood 4868c64220 [automerger skipped] Merge "More flexible API enforcement policy." into pi-dev am: c6d9f7ce1d

am: e52db912c7  -s ours

Change-Id: I7c59442fffffe85bae98654c084b3c0511480ea8

2018-03-27 11:02:21 +00:00

apct-tests/perftests

Merge "Added BinderCallsStatsService" into pi-dev

2018-03-21 23:02:58 +00:00

api

Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev am: c2bdecb8c8

2018-03-27 07:08:31 +00:00

cmds

Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev am: cdc9d9008b

2018-03-27 08:03:21 +00:00

config

Merge "Remove from hidden API light greylist" into pi-dev am: 3caac870ef

2018-03-27 08:15:29 +00:00

core

Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76

2018-03-27 10:45:58 +00:00

data

Amend package whitelist.

2018-03-21 09:30:12 +00:00

docs

Update baseline api docs

2018-03-23 17:14:12 -07:00

drm

…

graphics/java/android

Merge "Docs: add more detail to SurfaceTexture#getTimestamp"

2018-03-26 20:12:00 +00:00

keystore

Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev am: 799c3a62f7

2018-03-24 06:59:43 +00:00

libs

Merge "Add isPivotSet/resetPivot" into pi-dev am: 6045d66aa2

2018-03-23 22:14:45 +00:00

location

Merge "Deprecating unused fields from GnssMeasurement" into pi-dev am: a106a1a6b4

2018-03-23 14:02:39 +00:00

lowpan

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 15:13:23 +00:00

media

Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev am: 51e33d1948

2018-03-27 09:24:27 +00:00

native

Refactor AssetManager

2018-02-28 19:06:48 -08:00

nfc-extras

Fix link-type check warning on com.android.nfc_extras

2018-02-22 16:04:02 +09:00

obex

…

opengl/java

…

packages

Merge "Reset SIM state if the subscription is no longer active." into pi-dev am: 4f3d29de54

2018-03-27 08:27:26 +00:00

proto

Merge "Add metrics for new settings conditional cards." into pi-dev am: 930f74d00d

2018-03-27 03:08:34 +00:00

Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev

2018-03-23 22:11:38 +00:00

samples/training/network-usage

…

sax

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 15:13:23 +00:00

services

Merge "Require strong auth after user is stopped" into pi-dev am: 7109908a4e

2018-03-27 10:57:36 +00:00

telecomm

Merge "Rename handover failure constant per API review comments." am: 7c8a877231 am: ffe1c22271

2018-03-19 20:14:10 +00:00

telephony

Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev am: c2bdecb8c8

2018-03-27 07:08:31 +00:00

test-base

Merge "Build android.test.base/legacy against SDK"

2018-02-21 15:56:08 +00:00

test-legacy

…

test-mock

Don't build android.test.mock.stubs for unbundled builds

2018-03-23 20:25:18 +09:00

test-runner

Make android.test.mock.stubs in Android.bp

2018-03-23 09:47:56 +09:00

tests

Merge changes I72688f65,I2dd8d439 into pi-dev

2018-03-26 23:08:16 +00:00

tools

Merge "Add linter for strings.xml." into pi-dev am: 642c0be3f3

2018-03-27 01:32:36 +00:00

…

wifi

Merge "Remove unused ScanSettings and WifiChannel classes" into pi-dev

2018-03-20 17:16:27 +00:00

Android.bp

Merge "Split the DownloadStateCallback class into two"

2018-03-26 23:53:40 +00:00

Android.mk

Merge "Revert "Enable hidden API blacklist"" into pi-dev

2018-03-22 20:28:44 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Merge "Add linter for strings.xml." into pi-dev

2018-03-27 01:06:54 +00:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%