dba34ba35cd2042d9a8fecfda56e2abe7a680bad - platform/frameworks/base

commit	dba34ba35cd2042d9a8fecfda56e2abe7a680bad	[log] [tgz]
author	Jeff Brown <jeffbrown@google.com>	Tue Jun 24 20:46:03 2014 -0700
committer	Jeff Brown <jeffbrown@google.com>	Mon Jun 30 16:05:25 2014 -0700
tree	c8dead04fe9fbdba409cfdbf11fcdbcbb9174f99
parent	854157308e5426437277c9d31be64a2dedd57c7f [diff]

Make MediaSessionToken an inner class of MediaSession.

Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42

Android.mk[diff]
api/current.txt[diff]
core/java/android/app/Notification.java[diff]
media/java/android/media/session/IActiveSessionsListener.aidl[diff]
media/java/android/media/session/MediaController.java[diff]
media/java/android/media/session/MediaSession.aidl[Renamed from media/java/android/media/session/MediaSessionToken.aidl - diff]
media/java/android/media/session/MediaSession.java[diff]
media/java/android/media/session/MediaSessionManager.java[diff]
media/java/android/media/session/MediaSessionToken.java[Deleted - diff]
services/core/java/com/android/server/media/MediaSessionService.java[diff]
tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl[diff]
tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl[diff]
tests/OneMedia/src/com/android/onemedia/PlayerService.java[diff]
tests/OneMedia/src/com/android/onemedia/PlayerSession.java[diff]

14 files changed

tree: c8dead04fe9fbdba409cfdbf11fcdbcbb9174f99