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

am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Iae2496a4b761b7635c49272b0611bec7db4b9040

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