frameworks_base

Go to file

Primiano Tucci 0f422c6d80 resolved conflicts for merge of 28495b02 into master

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

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db

2014-10-08 12:22:29 +01:00

api

am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev

2014-10-06 19:43:58 +00:00

cmds

am 66c009eb: am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev

2014-10-07 00:13:18 +00:00

core

am 93116ed9: am 1ec045ad: am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

2014-10-08 08:00:17 +00:00

data

[FM] Add FM permission to support FM radio app

2014-10-01 18:39:16 -07:00

docs

am 7ac3ca42: am a09ae911: am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs

2014-10-08 07:51:44 +00:00

drm

am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

2014-06-10 01:30:05 +00:00

graphics

am 859edf79: am 0b6b0fa1: am 0660042a: Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev

2014-10-07 22:22:35 +00:00

include

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 19:08:50 +00:00

keystore

Correct test data size in keystore signing and verification tests.

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

libs

am 0a04e311: am f11d9de4: am 8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev

2014-10-06 22:36:31 +00:00

location

am 11735a0b: am 61e6d40b: am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs

2014-10-07 22:48:59 +00:00

media

am 5d0ac190: am 993b533a: am 63b6d3ed: am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev

2014-10-07 18:07:35 +00:00

native

Sensor related changes for NDK.

2014-08-05 19:34:04 -07:00

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Re-allow suppressing onDetachedFromWindow

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

packages

am 02737364: am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev

2014-10-07 23:15:56 +00:00

policy

am afcd4961: am 71747669: am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev

2014-10-08 07:51:48 +00:00

resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

2014-08-21 23:20:32 -07:00

samples/training/network-usage

…

sax

…

services

am 6add5fd4: am 1986ed7a: am 86141f6d: am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev

2014-10-08 07:59:44 +00:00

telecomm/java

am 329bd662: am 3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev

2014-10-07 20:55:45 +00:00

telephony/java

am ec20fc92: am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3

2014-10-07 05:27:48 +00:00

test-runner

am 59f7c4c7: am 1cb156bb: am f35c305f: am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev

2014-10-07 00:55:52 +00:00

tests

am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev

2014-10-07 20:41:11 +00:00

tools

am 5787920f: am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev

2014-10-04 00:42:36 +00:00

wifi/java/android/net/wifi

resolved conflicts for merge of 28495b02 into master

2014-10-08 12:22:29 +01:00

Android.mk

am 81f06a6d: am 1603e30e: am 6ef845d3: am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

2014-10-07 20:40:53 +00:00

CleanSpec.mk

Renaming Telecomm to Telecom.

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%