Leon Scroggins III b9c58ab617 Merge AssetStream with AssetStreamAdaptor. ...

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

Change-Id: I2a5395914e4f53830aaefee396556459083a1c56

2013-12-17 15:51:33 -05:00

api

Merge "ContactsContract api changes"

2013-12-13 00:11:53 +00:00

cmds

am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

2013-12-16 18:47:03 +00:00

core

Merge AssetStream with AssetStreamAdaptor.

2013-12-17 15:51:33 -05:00

data

KeypressInvalid_48k.ogg was 44.1 kHz previously

2013-11-19 16:40:06 -08:00

docs

am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

2013-12-16 18:39:25 +00:00

drm

Remove unused imports from frameworks/base.

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

graphics

Add Path trimming.

2013-12-09 14:34:54 -08:00

include

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

keystore

Remove unused imports from frameworks/base.

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

libs

Calculate and show Ambient shadow.

2013-12-13 17:25:47 -08:00

location

Remove unused imports from frameworks/base.

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

media

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -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

Merge "Fix incorrect name in eglSwapBuffers log wrapper"

2013-12-15 00:11:21 +00:00

packages

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

policy

Show hideycling for non-primary users.

2013-12-09 11:59:45 -05:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

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

services

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

telephony/java

am 66a9ebfd: am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication."

2013-12-05 02:45:32 +00:00

test-runner

Remove unused imports from frameworks/base.

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

tests

RenderThread work

2013-12-09 15:57:09 -08:00

wifi/java/android/net/wifi

Move Wifi/P2p service components under services

2013-12-11 16:06:49 -08:00

Android.mk

Adding INfcUnlockSettings and NfcUnlock interface class.

2013-12-09 14:41:01 -08:00

CleanSpec.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

preloaded-classes

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%