diff --git a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
index f6929611..833eae37 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
@@ -6,6 +6,7 @@ package com.widevine.demo;
 
 import android.app.Activity;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -454,7 +455,9 @@ public class VideoPlayerView extends Activity {
         buttonsLeft.addView(checkConstraints, params);
 
         LinearLayout buttonsRight = new LinearLayout(this);
-        buttonsRight.addView(mediaCodecModeButton, params);
+        if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.L) {
+            buttonsRight.addView(mediaCodecModeButton, params);
+        }
         buttonsRight.setOrientation(LinearLayout.VERTICAL);
         buttonsRight.addView(checkButton, params);
         buttonsRight.addView(removeButton, params);