83ff14c31049e80db503e64355287e66d18e0fb6 - frameworks_base

commit	83ff14c31049e80db503e64355287e66d18e0fb6	[log] [tgz]
author	Hyundo Moon <hdmoon@google.com>	Wed Jan 30 19:49:15 2019 +0900
committer	Hyundo Moon <hdmoon@google.com>	Wed Jan 30 22:03:04 2019 +0900
tree	4a9fb379e891ecba62f894f989d7a36dd7cd20b6
parent	2a5179df15abc6f304eeb2d8bd47a56d48c070ef [diff]

Move Media 1.0 files in mainline back to framework

Test: make update-api -j; make -j;
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: Ie30f0ca86bd9303683bf6573f2f5858c6fb3206a

Android.bp[diff]
media/Android.bp[diff]
media/java/android/media/MediaDescription.aidl[Renamed from media/apex/java/android/media/MediaDescription.aidl - diff]
media/java/android/media/MediaDescription.java[Renamed from media/apex/java/android/media/MediaDescription.java - diff]
media/java/android/media/MediaParceledListSlice.aidl[Renamed from media/apex/java/android/media/MediaParceledListSlice.aidl - diff]
media/java/android/media/MediaParceledListSlice.java[Renamed from media/apex/java/android/media/MediaParceledListSlice.java - diff]
media/java/android/media/Rating.aidl[Renamed from media/apex/java/android/media/Rating.aidl - diff]
media/java/android/media/Rating.java[Renamed from media/apex/java/android/media/Rating.java - diff]
media/java/android/media/VolumeProvider.java[Renamed from media/apex/java/android/media/VolumeProvider.java - diff]
media/java/android/media/browse/MediaBrowser.aidl[Renamed from media/apex/java/android/media/browse/MediaBrowser.aidl - diff]
media/java/android/media/browse/MediaBrowser.java[Renamed from media/apex/java/android/media/browse/MediaBrowser.java - diff]
media/java/android/media/browse/MediaBrowserUtils.java[Renamed from media/apex/java/android/media/browse/MediaBrowserUtils.java - diff]
media/java/android/media/session/ControllerCallbackLink.aidl[Renamed from media/apex/java/android/media/session/ControllerCallbackLink.aidl - diff]
media/java/android/media/session/ControllerCallbackLink.java[Renamed from media/apex/java/android/media/session/ControllerCallbackLink.java - diff]
media/java/android/media/session/ControllerLink.aidl[Renamed from media/apex/java/android/media/session/ControllerLink.aidl - diff]
media/java/android/media/session/ControllerLink.java[Renamed from media/apex/java/android/media/session/ControllerLink.java - diff]
media/java/android/media/session/ISession.aidl[Renamed from media/apex/java/android/media/session/ISession.aidl - diff]
media/java/android/media/session/ISessionCallback.aidl[Renamed from media/apex/java/android/media/session/ISessionCallback.aidl - diff]
media/java/android/media/session/ISessionController.aidl[Renamed from media/apex/java/android/media/session/ISessionController.aidl - diff]
media/java/android/media/session/ISessionControllerCallback.aidl[Renamed from media/apex/java/android/media/session/ISessionControllerCallback.aidl - diff]
media/java/android/media/session/MediaController.aidl[Renamed from media/apex/java/android/media/session/MediaController.aidl - diff]
media/java/android/media/session/MediaController.java[Renamed from media/apex/java/android/media/session/MediaController.java - diff]
media/java/android/media/session/MediaSessionEngine.java[Renamed from media/apex/java/android/media/session/MediaSessionEngine.java - diff]
media/java/android/media/session/MediaSessionProviderService.java[Renamed from media/apex/java/android/media/session/MediaSessionProviderService.java - diff]
media/java/android/media/session/PlaybackState.aidl[Renamed from media/apex/java/android/media/session/PlaybackState.aidl - diff]
media/java/android/media/session/PlaybackState.java[Renamed from media/apex/java/android/media/session/PlaybackState.java - diff]
media/java/android/media/session/SessionCallbackLink.aidl[Renamed from media/apex/java/android/media/session/SessionCallbackLink.aidl - diff]
media/java/android/media/session/SessionCallbackLink.java[Renamed from media/apex/java/android/media/session/SessionCallbackLink.java - diff]
media/java/android/media/session/SessionLink.aidl[Renamed from media/apex/java/android/media/session/SessionLink.aidl - diff]
media/java/android/media/session/SessionLink.java[Renamed from media/apex/java/android/media/session/SessionLink.java - diff]
media/java/android/service/media/IMediaBrowserService.aidl[Renamed from media/apex/java/android/service/media/IMediaBrowserService.aidl - diff]
media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl[Renamed from media/apex/java/android/service/media/IMediaBrowserServiceCallbacks.aidl - diff]
media/java/android/service/media/MediaBrowserService.java[Renamed from media/apex/java/android/service/media/MediaBrowserService.java - diff]

33 files changed