diff options
Diffstat (limited to 'services/mediaresourcemanager')
| -rw-r--r-- | services/mediaresourcemanager/ResourceManagerService.cpp | 6 | ||||
| -rw-r--r-- | services/mediaresourcemanager/test/ResourceManagerService_test.cpp | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp index e3f70ff..3c093f9 100644 --- a/services/mediaresourcemanager/ResourceManagerService.cpp +++ b/services/mediaresourcemanager/ResourceManagerService.cpp @@ -154,11 +154,11 @@ void ResourceManagerService::config(const Vector<MediaResourcePolicy> &policies) Mutex::Autolock lock(mLock); for (size_t i = 0; i < policies.size(); ++i) { String8 type = policies[i].mType; - uint64_t value = policies[i].mValue; + String8 value = policies[i].mValue; if (type == kPolicySupportsMultipleSecureCodecs) { - mSupportsMultipleSecureCodecs = (value != 0); + mSupportsMultipleSecureCodecs = (value == "true"); } else if (type == kPolicySupportsSecureWithNonSecureCodec) { - mSupportsSecureWithNonSecureCodec = (value != 0); + mSupportsSecureWithNonSecureCodec = (value == "true"); } } } diff --git a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp index bccc7fa..3d53f1f 100644 --- a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp +++ b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp @@ -180,17 +180,27 @@ protected: EXPECT_TRUE(mService->mSupportsSecureWithNonSecureCodec); Vector<MediaResourcePolicy> policies1; - policies1.push_back(MediaResourcePolicy(String8(kPolicySupportsMultipleSecureCodecs), 1)); policies1.push_back( - MediaResourcePolicy(String8(kPolicySupportsSecureWithNonSecureCodec), 0)); + MediaResourcePolicy( + String8(kPolicySupportsMultipleSecureCodecs), + String8("true"))); + policies1.push_back( + MediaResourcePolicy( + String8(kPolicySupportsSecureWithNonSecureCodec), + String8("false"))); mService->config(policies1); EXPECT_TRUE(mService->mSupportsMultipleSecureCodecs); EXPECT_FALSE(mService->mSupportsSecureWithNonSecureCodec); Vector<MediaResourcePolicy> policies2; - policies2.push_back(MediaResourcePolicy(String8(kPolicySupportsMultipleSecureCodecs), 0)); policies2.push_back( - MediaResourcePolicy(String8(kPolicySupportsSecureWithNonSecureCodec), 1)); + MediaResourcePolicy( + String8(kPolicySupportsMultipleSecureCodecs), + String8("false"))); + policies2.push_back( + MediaResourcePolicy( + String8(kPolicySupportsSecureWithNonSecureCodec), + String8("true"))); mService->config(policies2); EXPECT_FALSE(mService->mSupportsMultipleSecureCodecs); EXPECT_TRUE(mService->mSupportsSecureWithNonSecureCodec); |