diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-24 00:17:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 00:17:51 +0000 |
| commit | 3fa46d8bb636aeba420ebb2f454205d509f1af29 (patch) | |
| tree | ecbbf14a73040166df6f5d7a0037bf6e9036657e /services | |
| parent | 138f77425a0956d867f078881f91628518ae8258 (diff) | |
| parent | f2f79cfcdec89052f49b74f9aab48e58daf606c6 (diff) | |
| download | frameworks_av-3fa46d8bb636aeba420ebb2f454205d509f1af29.zip frameworks_av-3fa46d8bb636aeba420ebb2f454205d509f1af29.tar.gz frameworks_av-3fa46d8bb636aeba420ebb2f454205d509f1af29.tar.bz2 | |
Merge "RadioService: fix error handling in attach()."
Diffstat (limited to 'services')
| -rw-r--r-- | services/radio/RadioService.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/radio/RadioService.cpp b/services/radio/RadioService.cpp index a6c2bdf..cd0f5f3 100644 --- a/services/radio/RadioService.cpp +++ b/services/radio/RadioService.cpp @@ -146,7 +146,7 @@ status_t RadioService::attach(radio_handle_t handle, radio = module->addClient(client, config, withAudio); if (radio == 0) { - NO_INIT; + return NO_INIT; } return NO_ERROR; } @@ -500,13 +500,12 @@ sp<RadioService::ModuleClient> RadioService::Module::addClient(const sp<IRadioCl if (audio) { notifyDeviceConnection(true, ""); } + ALOGV("addClient() DONE moduleClient %p", moduleClient.get()); } else { + ALOGW("%s open_tuner failed with error %d", __FUNCTION__, ret); moduleClient.clear(); } - - ALOGV("addClient() DONE moduleClient %p", moduleClient.get()); - return moduleClient; } |