frameworks_base

Go to file

Marie Janssen 825d8ff56a resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

am: 07e590a574

Change-Id: I49fd2c3ed7ac5cbdf102ec289235b1fb12bee39a

2016-12-29 23:45:39 +00:00

api

Merge "Add simplified_network_settings_bool to CarrierConfig."

2016-12-22 21:41:23 +00:00

cmds

Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b

2016-12-07 13:16:12 +00:00

core

resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

2016-12-29 23:45:39 +00:00

data

Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d

2016-09-22 21:58:14 +00:00

docs

docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4

2016-12-17 05:09:37 +00:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241

2016-12-19 20:27:51 +00:00

keystore

Add the onDeviceOffBody API method to KeyStore

2016-10-06 16:13:48 +00:00

legacy-test

Copy core-junit files into legacy-test.

2016-12-14 14:19:08 +00:00

libs

Move hwui private headers to frameworks/base/libs/hwui/private am: 19def9943a am: 174d150673

2016-12-15 07:30:25 +00:00

location

Move dump() to dumpAsync(), more oneway calls.

2016-12-07 12:24:21 -08:00

media

Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca

2016-12-22 19:22:46 +00:00

native

Re-unite sources with their headers

2016-11-04 13:27:37 -07:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-22 18:25:14 +00:00

opengl/java

update GlSurfaceView:onPause/Resume docs

2016-06-29 14:40:42 -07:00

packages

Move grid checking into the layout algorithm.

2016-12-29 01:51:24 +00:00

proto

DO NOT MERGE Revert "Add Brightness setting for VR Mode."

2016-12-27 18:28:40 +00:00

Merge "Rely on the platform -std default."

2016-10-08 21:45:16 +00:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp

2016-12-29 23:45:39 +00:00

telecomm/java

Add ability to set supported audio routes on phone accounts and connection

2016-12-13 17:48:50 -08:00

telephony/java

Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902

2016-12-22 21:51:57 +00:00

test-runner

Copy junit-runner files into test-runner.

2016-12-14 10:41:05 +00:00

tests

DO NOT MERGE Stricter NetworkNotificationManagerTest

2016-12-20 06:49:08 +00:00

tools

Merge "Clean up local hprofs" am: 9ab94e15c7 am: 1876d82450

2016-12-18 00:28:42 +00:00

wifi

Revert "DO NOT MERGE: Add API to indicate carrier networks."

2016-12-22 13:16:53 -08:00

Android.bp

Convert libandroidfw to Android.bp

2016-12-02 11:23:12 -08:00

Android.mk

Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499

2016-12-29 20:00:09 +00:00

CleanSpec.mk

Fix incremental build

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

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Ensure apps cannot prevent uncaught exceptions being logged."

2016-08-09 09:02:27 +00:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%