am dcc5cc1e: Merge "Address compiler warning" into mnc-dev

* commit 'dcc5cc1ee13d7fa3383dd0192087962e30dd6e66':
  Address compiler warning
This commit is contained in:
Rahul Frias
2015-06-19 20:48:34 +00:00
committed by Android Git Automerger

View File

@@ -343,6 +343,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kEmptyLicenseRequest;
case wvcdm::UNKNOWN_ERROR:
return android::ERROR_DRM_UNKNOWN;
case wvcdm::UNUSED_1:
return android::UNKNOWN_ERROR;
}
// Return here instead of as a default case so that the compiler will warn