android_frameworks_base

Go to file

Christopher Tate ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev

* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257

2014-03-05 16:17:34 -08:00

api

Revert "Revert "Fix the build.""

2014-03-05 02:09:32 +00:00

cmds

Merge "Fix includes so that they no longer rely on the global Skia includes directories."

2014-02-28 13:23:15 +00:00

core

Merge "Remove invalid usage of DisplayList.isValid()"

2014-03-06 00:07:29 +00:00

data

am 533d300f: am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

2014-03-04 00:04:22 +00:00

docs

am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

2014-03-04 08:25:29 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

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

graphics

Restore getTintMode() method on BitmapDrawable

2014-02-26 17:20:10 -08:00

include

am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

2014-03-05 20:09:52 +00:00

keystore

KeyChain: add explicit package for getPrivateKey

2014-02-07 09:14:32 -08:00

libs

DisplayList overhaul

2014-03-04 15:18:16 -08:00

location

Injected settings no longer include summaries

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

media

fix MediaCodec release deadlock and resource leak

2014-03-03 12:29:49 -08:00

native

Cleanup unnecessary includes for libskia.

2014-02-27 16:21:24 +00:00

nfc-extras

…

obex

Fixed review comments

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

opengl/java

Fix bad link tag in javadoc.

2014-02-28 14:06:44 +00:00

packages

am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev

2014-03-04 19:19:04 +00:00

policy

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

2014-03-03 20:55:31 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev

2014-03-05 16:17:34 -08:00

telephony/java

Add get/setPreferredNetworkType() for OMA DM client.

2014-03-03 13:27:20 -08:00

test-runner

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

tests

am a70d20f6: am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test

2014-03-04 20:36:47 +00:00

tools

am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."

2014-03-01 17:35:54 +00:00

wifi/java/android/net/wifi

Merge "Add new API to scan a given channel set"

2014-02-27 03:12:06 +00:00

Android.mk

Hold a wake lock while dispatching network activity events.

2014-02-28 15:19:39 -08:00

CleanSpec.mk

Move Session apis to android.media.session

2014-02-25 16:01:55 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%