Merge "TIF: Set the surface secure" into nyc-dev am: 9675f16bba am: 711ae66a4b

am: 9aa6e93aba

* commit '9aa6e93abaebba22fa3f3592fa0c4eef84b780ea':
  TIF: Set the surface secure

Change-Id: I4ec13078760c33196c9db7ab82d3f38443b86516

media/java/android/media/tv/TvView.java

@@ -780,6 +780,8 @@ public class TvView extends ViewGroup {
                 super.updateWindow(force, redrawNeeded);
                 relayoutSessionOverlayView();
             }};
+        // The surface view's content should be treated as secure all the time.
+        mSurfaceView.setSecure(true);
         mSurfaceView.getHolder().addCallback(mSurfaceHolderCallback);
         if (mWindowZOrder == ZORDER_MEDIA_OVERLAY) {
             mSurfaceView.setZOrderMediaOverlay(true);