android_frameworks_base

Go to file

Wink Saville 8ffeda02d7 Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict

Conflicts:
	wifi/java/android/net/wifi/WifiConfiguration.java

Change-Id: If52be614cadf80955025097589f922072363e7ba

2014-11-12 08:24:40 -08:00

api

am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

2014-11-12 03:45:30 +00:00

cmds

am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 00:55:10 +00:00

core

am 358d1906: Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2 automerge: 70532bf

2014-11-12 03:45:20 +00:00

data

Use fonts for smaller languages of South and Southeast Asia.

2014-11-10 12:49:20 -08:00

docs

am 89f48e69: am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs automerge: cab3443

2014-11-11 00:16:05 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am e37c761e: am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev

2014-11-07 22:27:24 +00:00

include

am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"

2014-11-08 02:04:43 +00:00

keystore

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

libs

am 6ca82929: am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input"

2014-11-11 05:26:31 +00:00

location

am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev

2014-11-07 18:43:36 +00:00

media

am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985

2014-11-11 18:55:35 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

am d7b557fb: Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev automerge: 4ff2526 automerge: 1314e9a

2014-11-12 03:45:16 +00:00

policy

Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2

2014-11-12 03:19:50 +00:00

Frameworks/base: Wall Werror in rs

2014-11-10 20:35:59 -08:00

samples/training/network-usage

…

sax

…

services

am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

2014-11-12 03:45:30 +00:00

telecomm/java

Update PhoneAccount icon API (1/6)

2014-11-11 13:18:49 -08:00

telephony/java

am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

2014-11-12 03:45:30 +00:00

test-runner

am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

2014-10-30 23:44:09 +00:00

tests

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

tools

am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7

2014-11-12 02:46:10 +00:00

wifi/java/android/net/wifi

Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict

2014-11-12 08:24:40 -08:00

Android.mk

am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

2014-11-12 03:45:30 +00:00

CleanSpec.mk

Renaming Telecomm to Telecom.

2014-09-12 22:16:17 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE

2014-11-09 16:08:15 +00:00

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%