From 946d9f1d21b53aed2275544764d48157ab2fdb98 Mon Sep 17 00:00:00 2001 From: jiabin Date: Mon, 14 Dec 2020 21:13:30 -0800 Subject: [PATCH] Add package name when initializing SoundPool. The package name is useful for permission validation. Currently, package name is required when starting external vibration so that the vibrator service can verify if the app has the permission to start vibration. Bug: 175595599 Test: SoundPool tests in cts Test: play audio-coupled-haptic file using SoundPool. Change-Id: Ibfe414063a303118a5bb393d65ea5dc2323bf722 Merged-In: Ibfe414063a303118a5bb393d65ea5dc2323bf722 (cherry picked from commit de9005bab1751e23342bbc9f0f51213eea8885af) --- media/java/android/media/SoundPool.java | 5 +++-- media/jni/soundpool/SoundPool.cpp | 5 +++-- media/jni/soundpool/SoundPool.h | 5 ++++- media/jni/soundpool/Stream.cpp | 4 +++- media/jni/soundpool/StreamManager.cpp | 4 +++- media/jni/soundpool/StreamManager.h | 8 +++++++- media/jni/soundpool/android_media_SoundPool.cpp | 8 +++++--- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java index 1bf2863989a57..3f685a4c934ed 100644 --- a/media/java/android/media/SoundPool.java +++ b/media/java/android/media/SoundPool.java @@ -149,7 +149,8 @@ public class SoundPool extends PlayerBase { super(attributes, AudioPlaybackConfiguration.PLAYER_TYPE_JAM_SOUNDPOOL); // do native setup - if (native_setup(new WeakReference(this), maxStreams, attributes) != 0) { + if (native_setup(new WeakReference(this), + maxStreams, attributes, getCurrentOpPackageName()) != 0) { throw new RuntimeException("Native setup failed"); } mAttributes = attributes; @@ -501,7 +502,7 @@ public class SoundPool extends PlayerBase { private native final int _load(FileDescriptor fd, long offset, long length, int priority); private native final int native_setup(Object weakRef, int maxStreams, - Object/*AudioAttributes*/ attributes); + @NonNull Object/*AudioAttributes*/ attributes, @NonNull String opPackageName); private native final int _play(int soundID, float leftVolume, float rightVolume, int priority, int loop, float rate); diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index ac44843859f6d..253b4e3a8a098 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -84,8 +84,9 @@ bool checkLoop(int32_t *loop) } // namespace -SoundPool::SoundPool(int32_t maxStreams, const audio_attributes_t* attributes) - : mStreamManager(maxStreams, kStreamManagerThreads, attributes) +SoundPool::SoundPool( + int32_t maxStreams, const audio_attributes_t* attributes, const std::string& opPackageName) + : mStreamManager(maxStreams, kStreamManagerThreads, attributes, opPackageName) { ALOGV("%s(maxStreams=%d, attr={ content_type=%d, usage=%d, flags=0x%x, tags=%s })", __func__, maxStreams, diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h index d5b16ef629cda..ffb1c997393a3 100644 --- a/media/jni/soundpool/SoundPool.h +++ b/media/jni/soundpool/SoundPool.h @@ -19,6 +19,8 @@ #include "SoundManager.h" #include "StreamManager.h" +#include + namespace android { /** @@ -29,7 +31,8 @@ namespace android { */ class SoundPool { public: - SoundPool(int32_t maxStreams, const audio_attributes_t* attributes); + SoundPool(int32_t maxStreams, const audio_attributes_t* attributes, + const std::string& opPackageName = {}); ~SoundPool(); // SoundPool Java API support diff --git a/media/jni/soundpool/Stream.cpp b/media/jni/soundpool/Stream.cpp index e7042d0562a4c..73e319a5902e1 100644 --- a/media/jni/soundpool/Stream.cpp +++ b/media/jni/soundpool/Stream.cpp @@ -332,7 +332,9 @@ void Stream::play_l(const std::shared_ptr& sound, int32_t nextStreamID, 0 /*default notification frames*/, AUDIO_SESSION_ALLOCATE, AudioTrack::TRANSFER_DEFAULT, nullptr /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, - mStreamManager->getAttributes()); + mStreamManager->getAttributes(), + false /*doNotReconnect*/, 1.0f /*maxRequiredSpeed*/, + mStreamManager->getOpPackageName()); // Set caller name so it can be logged in destructor. // MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_SOUNDPOOL newTrack->setCallerName("soundpool"); diff --git a/media/jni/soundpool/StreamManager.cpp b/media/jni/soundpool/StreamManager.cpp index 5b6494d4947eb..502ee00b583e6 100644 --- a/media/jni/soundpool/StreamManager.cpp +++ b/media/jni/soundpool/StreamManager.cpp @@ -98,9 +98,11 @@ int32_t StreamMap::getNextIdForStream(Stream* stream) const { #pragma clang diagnostic ignored "-Wthread-safety-analysis" StreamManager::StreamManager( - int32_t streams, size_t threads, const audio_attributes_t* attributes) + int32_t streams, size_t threads, const audio_attributes_t* attributes, + std::string opPackageName) : StreamMap(streams) , mAttributes(*attributes) + , mOpPackageName(std::move(opPackageName)) { ALOGV("%s(%d, %zu, ...)", __func__, streams, threads); forEach([this](Stream *stream) { diff --git a/media/jni/soundpool/StreamManager.h b/media/jni/soundpool/StreamManager.h index 59ae2f9d108b3..81ac69eb43580 100644 --- a/media/jni/soundpool/StreamManager.h +++ b/media/jni/soundpool/StreamManager.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -386,7 +387,8 @@ class StreamManager : public StreamMap { public: // Note: the SoundPool pointer is only used for stream initialization. // It is not stored in StreamManager. - StreamManager(int32_t streams, size_t threads, const audio_attributes_t* attributes); + StreamManager(int32_t streams, size_t threads, const audio_attributes_t* attributes, + std::string opPackageName); ~StreamManager(); // Returns positive streamID on success, 0 on failure. This is locked. @@ -400,6 +402,8 @@ public: const audio_attributes_t* getAttributes() const { return &mAttributes; } + const std::string& getOpPackageName() const { return mOpPackageName; } + // Moves the stream to the restart queue (called upon BUFFER_END of the static track) // this is locked internally. // If activeStreamIDToMatch is nonzero, it will only move to the restart queue @@ -473,6 +477,8 @@ private: // The paired stream may be active or restarting. // No particular order. std::unordered_set mProcessingStreams GUARDED_BY(mStreamManagerLock); + + const std::string mOpPackageName; }; } // namespace android::soundpool diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp index 8f6df3db718b0..de96737d40343 100644 --- a/media/jni/soundpool/android_media_SoundPool.cpp +++ b/media/jni/soundpool/android_media_SoundPool.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "SoundPool.h" @@ -181,7 +182,7 @@ static void android_media_callback(SoundPoolEvent event, SoundPool* soundPool, v static jint android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, - jint maxChannels, jobject jaa) + jint maxChannels, jobject jaa, jstring opPackageName) { if (jaa == nullptr) { ALOGE("Error creating SoundPool: invalid audio attributes"); @@ -203,7 +204,8 @@ android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, paa->flags = env->GetIntField(jaa, javaAudioAttrFields.fieldFlags); ALOGV("android_media_SoundPool_native_setup"); - auto *ap = new SoundPool(maxChannels, paa); + ScopedUtfChars opPackageNameStr(env, opPackageName); + auto *ap = new SoundPool(maxChannels, paa, opPackageNameStr.c_str()); if (ap == nullptr) { return -1; } @@ -298,7 +300,7 @@ static JNINativeMethod gMethods[] = { (void *)android_media_SoundPool_setRate }, { "native_setup", - "(Ljava/lang/Object;ILjava/lang/Object;)I", + "(Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/String;)I", (void*)android_media_SoundPool_native_setup }, { "native_release",