Resolve feedback from API review
Fix inconsistent naming of offline license states
bug:120489407
bug:120488811
test:cts and gts media tests
Change-Id: I6cceac233cf8882c5bf7fbef7503764c611125d1
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 866325c..d7ab854 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -175,7 +175,7 @@
struct OfflineLicenseState {
jint kOfflineLicenseStateUsable;
- jint kOfflineLicenseStateInactive;
+ jint kOfflineLicenseStateReleased;
jint kOfflineLicenseStateUnknown;
} gOfflineLicenseStates;
@@ -797,10 +797,10 @@
GET_STATIC_FIELD_ID(field, clazz, "SECURITY_LEVEL_HW_SECURE_ALL", "I");
gSecurityLevels.kSecurityLevelHwSecureAll = env->GetStaticIntField(clazz, field);
- GET_STATIC_FIELD_ID(field, clazz, "OFFLINE_LICENSE_USABLE", "I");
+ GET_STATIC_FIELD_ID(field, clazz, "OFFLINE_LICENSE_STATE_USABLE", "I");
gOfflineLicenseStates.kOfflineLicenseStateUsable = env->GetStaticIntField(clazz, field);
- GET_STATIC_FIELD_ID(field, clazz, "OFFLINE_LICENSE_INACTIVE", "I");
- gOfflineLicenseStates.kOfflineLicenseStateInactive = env->GetStaticIntField(clazz, field);
+ GET_STATIC_FIELD_ID(field, clazz, "OFFLINE_LICENSE_STATE_RELEASED", "I");
+ gOfflineLicenseStates.kOfflineLicenseStateReleased = env->GetStaticIntField(clazz, field);
GET_STATIC_FIELD_ID(field, clazz, "OFFLINE_LICENSE_STATE_UNKNOWN", "I");
gOfflineLicenseStates.kOfflineLicenseStateUnknown = env->GetStaticIntField(clazz, field);
@@ -1581,8 +1581,8 @@
switch(state) {
case DrmPlugin::kOfflineLicenseStateUsable:
return gOfflineLicenseStates.kOfflineLicenseStateUsable;
- case DrmPlugin::kOfflineLicenseStateInactive:
- return gOfflineLicenseStates.kOfflineLicenseStateInactive;
+ case DrmPlugin::kOfflineLicenseStateReleased:
+ return gOfflineLicenseStates.kOfflineLicenseStateReleased;
default:
return gOfflineLicenseStates.kOfflineLicenseStateUnknown;
}