diff options
| author | Eric Laurent <elaurent@google.com> | 2015-05-22 19:23:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-22 19:24:07 +0000 |
| commit | 6374077319a2d060eefe5f4bf425aed37f90c5d0 (patch) | |
| tree | 50ae6f691720ce4773b6a6757507ee286ba95205 /services/audiopolicy/managerdefault/AudioPolicyManager.h | |
| parent | 3a9a6ea4e9f67c6a43f00ae3d980eb475e49deaf (diff) | |
| parent | 87ffa39d29d1803b48237888a9fbf3d5f2c60c21 (diff) | |
| download | frameworks_av-6374077319a2d060eefe5f4bf425aed37f90c5d0.zip frameworks_av-6374077319a2d060eefe5f4bf425aed37f90c5d0.tar.gz frameworks_av-6374077319a2d060eefe5f4bf425aed37f90c5d0.tar.bz2 | |
Merge "audio policy: add checks on primary output" into mnc-dev
Diffstat (limited to 'services/audiopolicy/managerdefault/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/managerdefault/AudioPolicyManager.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h index ea16864..f9d1198 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h @@ -553,10 +553,16 @@ protected: audio_devices_t availablePrimaryOutputDevices() const { + if (!hasPrimaryOutput()) { + return AUDIO_DEVICE_NONE; + } return mPrimaryOutput->supportedDevices() & mAvailableOutputDevices.types(); } audio_devices_t availablePrimaryInputDevices() const { + if (!hasPrimaryOutput()) { + return AUDIO_DEVICE_NONE; + } return mAvailableInputDevices.getDevicesFromHwModule(mPrimaryOutput->getModuleHandle()); } @@ -576,6 +582,8 @@ protected: void clearSessionRoutes(uid_t uid); void checkStrategyRoute(routing_strategy strategy, audio_io_handle_t ouptutToSkip); + status_t hasPrimaryOutput() const { return mPrimaryOutput != 0; } + uid_t mUidCached; AudioPolicyClientInterface *mpClientInterface; // audio policy client interface sp<SwAudioOutputDescriptor> mPrimaryOutput; // primary output descriptor |