Revert "Add feature flag to change the CDM version to 18.0.2"
This reverts commit 10f6252e4d.
Reason for revert: Increase in memory size for android.hardware.drm-service.widevine
Bug: 324438957
Change-Id: I39c9ca1ebc1da6b9997f63082530fc258974c5ec
This commit is contained in:
committed by
Android (Google) Code Review
parent
10f6252e4d
commit
e92b739407
@@ -12,15 +12,11 @@
|
||||
#include <android-base/properties.h>
|
||||
#include <android/sysprop/WidevineProperties.sysprop.h>
|
||||
|
||||
#include <com_android_mediadrm_widevine_flags.h>
|
||||
|
||||
#include "log.h"
|
||||
#include "wv_android_constants.h"
|
||||
#include "widevine_apex_info.h"
|
||||
|
||||
using namespace android::sysprop;
|
||||
|
||||
namespace mediadrm_flags = com::android::mediadrm::widevine::flags;
|
||||
namespace {
|
||||
|
||||
const char kBasePathPrefix[] = "/data/vendor/mediadrm/IDM";
|
||||
@@ -150,11 +146,7 @@ bool Properties::GetWVCdmVersion(std::string* version) {
|
||||
}
|
||||
#endif
|
||||
|
||||
if (mediadrm_flags::update_cdm_version_to_18_0_2()) {
|
||||
*version = kWVAndroidCdmVersion_18_0_2 + apex_version;
|
||||
} else {
|
||||
*version = kWVAndroidCdmVersion_18_0_1 + apex_version;
|
||||
}
|
||||
*version = kWVAndroidCdmVersion + apex_version;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user