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

am: 6cb63622e3

* commit '6cb63622e331affd8500a93a9a9660fde1725611':
  TIF: Set the surface secure

Change-Id: I90345d31b53c35f0144c60d70b0f9244a90f0eba

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);