diff --git a/library/src/main/java/com/google/android/exoplayer2/C.java b/library/src/main/java/com/google/android/exoplayer2/C.java index a157fd85a9..4f3e462dec 100644 --- a/library/src/main/java/com/google/android/exoplayer2/C.java +++ b/library/src/main/java/com/google/android/exoplayer2/C.java @@ -444,11 +444,11 @@ public final class C { public static final UUID UUID_NIL = new UUID(0L, 0L); /** - * UUID for the - * CENC DRM - * scheme. + * UUID for the ClearKey DRM scheme. + *
+ * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
*/
- public static final UUID CENC_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL);
+ public static final UUID CLEARKEY_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL);
/**
* UUID for the Widevine DRM scheme.
diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index bc57b7e810..6fc149ba32 100644
--- a/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -341,10 +341,10 @@ public class DefaultDrmSessionManager