Etan Cohen 26d5be2e5d [NAN] Consolidate publish/subscribe callback sets into single set ...

Merge onPublishFail & onSubscribeFail into onSessionConfigFail.
Merge onPublishTerminated & onSubscribeTerminated into onSessionTerminated.
A session is either publish or subscribe (never the two) so redundant.

(cherry-pick of 8414f5cf2b)

Bug: 27610709
Change-Id: I0282d17db88754428da25ee5f064b9a4805f9736
(cherry picked from commit 776ba56e53)

2016-08-26 13:18:57 -07:00

api

Track java.lang.reflect.Executable API changes

2016-08-26 10:44:51 +01:00

cmds

Merge "Remove unused includes."

2016-08-18 03:22:39 +00:00

core

Unicode: specify destination length in utf8_to_utf16 methods

2016-08-25 12:04:40 +02:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev

2016-06-01 22:45:33 +00:00

docs

Merge "Update SMP documentation."

2016-08-05 02:05:57 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Only block invalidation in DrawableContainer initialization

2016-06-17 13:08:42 -04:00

include

Merge \"Handle long process names correctly.\"

2016-07-19 00:19:15 +00:00

keystore

More thorough cleansing of expired users

2016-06-15 11:32:16 -07:00

libs

Unicode: specify destination length in utf8_to_utf16 methods

2016-08-25 12:04:40 +02:00

location

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

media

resolve merge conflicts of c76a3ac to stage-aosp-master

2016-08-17 13:28:04 -07:00

native

Merge "Enable clang for arm64."

2016-08-04 17:19:10 +00:00

nfc-extras

Clean up dist files.

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

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-22 18:25:14 +00:00

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

DO NOT MERGE ANYWHERE - Clear preferences when package is removed.

2016-08-24 14:27:48 -07:00

proto

add metrics for gestural notification expansions

2016-05-26 17:20:33 -04:00

rs

Delete simple reduction implementation.

2016-06-14 14:30:06 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Merge "Fix suspend crash issue on no GPU platform."

2016-08-25 18:01:06 +00:00

telecomm/java

Handle Concurrency issues in Connection

2016-06-15 20:53:25 +00:00

telephony/java

Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev

2016-06-14 17:15:41 +00:00

test-runner

ContextImpl: Keep DisplayAdjustments and Display in sync

2016-06-21 17:55:58 -07:00

tests

Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev

2016-06-16 21:22:22 +00:00

tools

Add bound checks to utf16_to_utf8

2016-08-25 12:19:12 +02:00

wifi/java/android/net/wifi

[NAN] Consolidate publish/subscribe callback sets into single set

2016-08-26 13:18:57 -07:00

Android.mk

[NAN] Renamed listeners to callback per API guidelines

2016-08-26 13:18:55 -07:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Ensure apps cannot prevent uncaught exceptions being logged."

2016-08-09 09:02:27 +00:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%