Tom O'Neill f083ae5859 am 95b2299d: Merge "API for location settings injection" into klp-dev ...

* commit '95b2299dc476f4dbd50b8da8e0debff4b5ccba50':
  API for location settings injection

2013-08-13 17:30:18 -07:00

api

Merge "API for location settings injection" into klp-dev

2013-08-14 00:22:18 +00:00

cmds

Changes needed to support Skia at r10377.

2013-08-01 12:52:21 -04:00

core

am 95b2299d: Merge "API for location settings injection" into klp-dev

2013-08-13 17:30:18 -07:00

data

prototype colour emoji font

2013-08-07 15:46:16 -07:00

docs

am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.

2013-08-13 11:00:49 -07:00

drm

…

graphics

Camera.applyToCanvas() now works with hardware canvases

2013-08-13 10:37:25 -07:00

include

Clearly separate consumer and producer interfaces

2013-08-06 13:07:42 -07:00

keystore

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

libs

fix kBW_Format glyphs

2013-08-12 15:12:49 -07:00

location

Merge "API for location settings injection" into klp-dev

2013-08-14 00:22:18 +00:00

media

Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

2013-08-12 09:23:49 -07:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

…

obex

Bluetooth MAP profile - sms and mms support initial check-in

2013-08-09 15:01:07 -07:00

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

am 2163bb09: Merge "Don\'t allow airplane mode to affect location status icon. Gps still operates when airplane mode is on, and consumes just as much power so the icon shouldn\'t be hidden." into klp-dev

2013-08-13 17:16:19 -07:00

policy

Update transient navigation confirmation logic.

2013-08-13 13:18:14 -04:00

samples/training/network-usage

…

sax

…

services

Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider. Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement)." into klp-dev

2013-08-14 00:07:58 +00:00

telephony/java

Add network type TYPE_MOBILE_IA.

2013-07-29 15:02:29 -07:00

test-runner

Catch a few extra users of UserEnvironment.

2013-08-11 17:42:17 -07:00

tests

Support public virtual displays.

2013-08-02 21:11:07 -07:00

tools

Merge "Bring along BridgeContext for the ride." into klp-dev

2013-08-12 02:09:51 +00:00

wifi/java/android/net/wifi

Merge "Add support for batched wifi scans." into klp-dev

2013-08-13 23:22:52 +00:00

Android.mk

Merge "Add support in the platform for Flp Geofencing." into klp-dev

2013-08-13 23:56:31 +00:00

CleanSpec.mk

Add missing cleanspec

2013-08-12 09:33:38 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"

2013-07-30 14:10:43 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%