frameworks_base

Go to file

Craig Mautner 6af40da8af am d2cc56eb: resolved conflicts for merge of f8a58208 to master

* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded

2014-04-24 17:34:10 +00:00

api

am d2cc56eb: resolved conflicts for merge of f8a58208 to master

2014-04-24 17:34:10 +00:00

cmds

am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."

2014-04-24 15:43:24 +00:00

core

am d2cc56eb: resolved conflicts for merge of f8a58208 to master

2014-04-24 17:34:10 +00:00

data

Add Fire TV remote key layout.

2014-04-18 14:24:12 -07:00

docs

am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.

2014-04-23 02:55:21 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Merge "Clip TouchFeedbackDrawable effect to receiver Outline"

2014-04-24 00:08:09 +00:00

include

am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:06:10 +00:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Merge "Clip TouchFeedbackDrawable effect to receiver Outline"

2014-04-24 00:08:09 +00:00

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

camera2: Fix broken camera metadata test due to key rename

2014-04-22 16:29:45 -07:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

Merge "Import translations. DO NOT MERGE"

2014-04-24 14:28:38 +00:00

policy

resolved conflicts for merge of d90712d0 to master

2014-04-22 11:05:15 -07:00

am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

2014-04-17 23:33:54 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

Merge "Fix two potential NPEs in DeviceInfo"

2014-04-24 17:11:51 +00:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

2014-04-15 18:41:37 +00:00

telephony/java

resolved conflicts for merge of 8d966e42 to master-nova

2014-04-16 13:14:39 -07:00

test-runner

am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()

2014-04-11 19:01:21 +00:00

tests

Clip TouchFeedbackDrawable effect to receiver Outline

2014-04-23 16:15:11 -07:00

tools

am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

2014-04-24 01:36:22 +00:00

wifi/java/android/net/wifi

am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev

2014-04-17 21:57:12 +00:00

Android.mk

am 2ca3962b: Merge "Initial implementation of NetworkScoreManager\'s backing service."

2014-04-22 13:24:14 +00:00

CleanSpec.mk

Add cleanspec for media Session apis.

2014-04-18 14:48:24 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%