frameworks_base

Go to file

Adrian Roos 8f2144810e [automerger skipped] Fix build more am: d9d5f654c7 -s ours am: 4b6a13ed45 -s ours

am: 4cfc86c77d  -s ours

Change-Id: Icb94ab7b291eaf1efb99254daa5b35b7ac94943e

2018-05-02 13:45:13 -07:00

apct-tests/perftests

Added missing @LargeTest annotation.

2018-05-02 07:30:47 -07:00

api

Add setter and getter for Toolbar's collapse icon.

2018-05-02 18:17:55 +00:00

cmds

Merge "Add a section flag to bypass failure if a specific path can't be found."

2018-05-02 01:30:13 +00:00

config

Merge "Greylist updates from bugreports, Wednesday edition." into pi-dev am: 05b5cfd453

2018-05-02 13:34:11 -07:00

core

Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev am: 90f197efe5

2018-05-02 13:29:40 -07:00

data

Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev

2018-04-17 00:04:53 +00:00

docs

Merge "Camera: update tonemap image in html doc"

2018-04-03 13:42:15 +00:00

drm

…

graphics/java/android

Merge "Updated documentation of StateListDrawable#addState in order to indicate that sharing a Drawable across multiple Views/Drawables can lead to undefined rendering behavior"

2018-05-01 22:50:38 +00:00

keystore

Use the @Nullable annotations for choosePrivateKeyAlias.

2018-04-30 09:27:31 +00:00

libs

Merge "remove (dead) Font code"

2018-05-02 17:55:27 +00:00

location

Expose APIs used by CtsPermissionTestCases

2018-04-26 09:40:57 -07:00

lowpan

Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62

2018-04-04 17:56:57 -07:00

media

Merge "Fix documentation bug that breaks generation" into pi-dev am: 353a9bc4bf

2018-04-27 17:07:32 -07:00

native

Update native/webview OWNERS.

2018-04-16 17:29:00 -04:00

nfc-extras

com.android.nfc_extras is built with java_sdk_library

2018-04-27 16:34:29 +09:00

obex

…

opengl/java

…

packages

Merge "Fix RTL TileLayout." into pi-dev am: 12a1c46a67

2018-05-02 13:25:33 -07:00

proto

metrics constant for new button am: 2e6c19cfce

2018-05-01 08:06:30 -07: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 17:15:21 +00:00

services

Merge "don't block adb while running uninstall"

2018-05-02 19:57:20 +00:00

telecomm

Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds." am: a355552bfe am: cc9acb51c5

2018-04-24 10:14:09 -07:00

telephony

Merge "Clean up old Context references in ImsConfig" into pi-dev am: 65ac70515f

2018-05-01 16:33:28 -07:00

test-base

Migrate android.test.base.stubs generation to Soong.

2018-04-13 14:55:16 -07:00

test-legacy

…

test-mock

Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev am: 7f556daa41

2018-05-01 13:52:35 -07:00

test-runner

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

2018-04-13 11:21:54 +09:00

tests

Merge changes from topic "am-b4a6d70f84a44081adc7240053891656" into pi-dev-plus-aosp

2018-05-01 20:11:28 -07:00

tools

AAPT2: add flag for strict visibility

2018-05-02 13:14:33 +01:00

…

wifi

Merge "Revert "Revert "WifiManager: Return status from startScan()""" into pi-dev

2018-04-27 17:32:12 -07:00

Android.bp

resolve merge conflicts of 4d213e5856 to pi-dev-plus-aosp

2018-05-02 13:44:48 +00:00

Android.mk

Merge non-SDK @removed API and light greylist am: 0585533a85

2018-05-02 13:22:09 -07:00

CleanSpec.mk

Enforce dump permission in stats service

2018-04-16 15:04:28 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Merge "Add presubmit hook for hidden API lists." into pi-dev

2018-04-24 09:47:36 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%