From c4d88be1fb379ee0e6a7e93ee2c3dcf06ffa3a5b Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Sat, 4 Aug 2012 23:02:20 -0700 Subject: [PATCH] Fixed: screen time out during streaming in mediacodec mode. Also, print log to indicate if the device is provisioned or not. Change-Id: I674e2fe4531cc79b4bf307939c4b08ba19207244 related-to-bug: 6821614 --- .../src/com/widevine/demo/VideoPlayerView.java | 3 +++ .../src/com/widevine/demo/WidevineDrm.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java index 60525ff9..8502b460 100644 --- a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java +++ b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java @@ -18,6 +18,7 @@ import android.widget.Button; import android.view.Display; import android.view.Gravity; import android.view.View; +import android.view.WindowManager; import android.content.Context; import android.view.SurfaceHolder; @@ -62,6 +63,8 @@ public class VideoPlayerView extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Display display = getWindowManager().getDefaultDisplay(); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + height = display.getHeight(); width = display.getWidth(); context = this; diff --git a/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java b/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java index b42123c6..3fa56d19 100644 --- a/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java +++ b/proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java @@ -130,7 +130,15 @@ public class WidevineDrm { } public boolean isProvisionedDevice() { - logMessage("mWVDrmInfoRequestStatusKey = " + mWVDrmInfoRequestStatusKey + "\n"); + + if (mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED) + logMessage("Device is provisioined\n"); + else if (mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED_SD_ONLY) + logMessage("Device is provisioined SD only\n"); + else if (mWVDrmInfoRequestStatusKey == DEVICE_IS_NOT_PROVISIONED) + logMessage("Device is not provisioined\n"); + else + logMessage("Invalid provisioned status=" + mWVDrmInfoRequestStatusKey +"\n"); return ((mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED) || (mWVDrmInfoRequestStatusKey == DEVICE_IS_PROVISIONED_SD_ONLY));