Merge "Moving IPlayer.aidl to frameworks/av/."

6 files changed, 8 insertions, 55 deletions

diff --git a/Android.mk b/Android.mk
index e61d7c2a5c0f..46fa0d6cc0f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -453,7 +453,7 @@ LOCAL_SRC_FILES += \
 	media/java/android/media/IMediaScannerListener.aidl \
 	media/java/android/media/IMediaScannerService.aidl \
 	media/java/android/media/IPlaybackConfigDispatcher.aidl \
-	media/java/android/media/IPlayer.aidl \
+	../av/media/libaudioclient/aidl/android/media/IPlayer.aidl \
 	media/java/android/media/IRecordingConfigDispatcher.aidl \
 	media/java/android/media/IRemoteDisplayCallback.aidl \
 	media/java/android/media/IRemoteDisplayProvider.aidl \
@@ -587,6 +587,7 @@ LOCAL_AIDL_INCLUDES += \
 LOCAL_AIDL_INCLUDES += \
 	frameworks/av/camera/aidl \
 	frameworks/av/drm/libmediadrm/aidl \
+	frameworks/av/media/libaudioclient/aidl \
 	frameworks/native/aidl/gui \
 	system/netd/server/binder \
 	system/bt/binder
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index c7ed599d1b75..556ac27dfe9e 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -44,6 +44,8 @@
 
 using namespace android;
 
+using ::android::media::VolumeShaper;
+
 // ----------------------------------------------------------------------------
 static const char* const kClassPathName = "android/media/AudioTrack";
 static const char* const kAudioAttributesClassPathName = "android/media/AudioAttributes";
diff --git a/media/java/android/media/IPlayer.aidl b/media/java/android/media/IPlayer.aidl
deleted file mode 100644
index 2d60bf956904..000000000000
--- a/media/java/android/media/IPlayer.aidl
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media;
-
-import android.media.VolumeShaper;
-
-/**
- * @hide
- */
-interface IPlayer {
-    oneway void start();
-    oneway void pause();
-    oneway void stop();
-    oneway void setVolume(float vol);
-    oneway void setPan(float pan);
-    oneway void setStartDelayMs(int delayMs);
-    oneway void applyVolumeShaper(in VolumeShaper.Configuration configuration,
-                                  in VolumeShaper.Operation operation);
-}
diff --git a/media/java/android/media/VolumeShaper.aidl b/media/java/android/media/VolumeShaper.aidl
deleted file mode 100644
index ecf6a8f5d0f8..000000000000
--- a/media/java/android/media/VolumeShaper.aidl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.media;
-
-parcelable VolumeShaper.Configuration;
-parcelable VolumeShaper.Operation;
-parcelable VolumeShaper.State;
\ No newline at end of file
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index c8ec7c4a3ba5..59e0816e99f2 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -78,6 +78,8 @@ static StateExceptionFields gStateExceptionFields;
 
 using namespace android;
 
+using media::VolumeShaper;
+
 // ----------------------------------------------------------------------------
 
 struct fields_t {
diff --git a/media/jni/android_media_VolumeShaper.h b/media/jni/android_media_VolumeShaper.h
index 1a13ffa24c43..1171b467e644 100644
--- a/media/jni/android_media_VolumeShaper.h
+++ b/media/jni/android_media_VolumeShaper.h
@@ -21,6 +21,8 @@
 
 namespace android {
 
+using media::VolumeShaper;
+
 // This entire class is inline as it is used from both core and media
 struct VolumeShaperHelper {
     struct fields_t {