| commit | 739c8b9811f8907acfcd4d8eca7276924410a4d0 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Wed Jul 12 19:50:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 12 19:50:47 2017 +0000 |
| tree | 6dc4ffe808fe9c5a038e8e71fbdaef76e8f17688 | |
| parent | 8280e4156628d53c0a90c405fa57d4c40c33b62b [diff] | |
| parent | 7c126c23f4f1d70454e2a3564cd55fd000af34bd [diff] |
Merge "audioflinger: Fix missing 'return' statement in 'getParameters'" into oc-dr1-dev am: 4a907a1760 am: 7c126c23f4 Change-Id: Icdb798f6101479cc3d63e7bcd2309f660d63dd72
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 0d6d5ee..38c9687 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -1282,7 +1282,7 @@ if (thread == NULL) { thread = (ThreadBase *)checkMmapThread_l(ioHandle); if (thread == NULL) { - String8(""); + return String8(""); } } }