Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0681b34 authored by Jeff Brown's avatar Jeff Brown
Browse files

Secure windows, secure surface views and secure displays. 

Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.

Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
parent 56e75631

api/17.txt

+2 −0
Original line number Diff line number Diff line
@@ -23742,6 +23742,7 @@ package android.view { 
    method public deprecated int getWidth();

    method public boolean isValid();

    field public static final int DEFAULT_DISPLAY = 0; // 0x0

    field public static final int FLAG_SECURE = 2; // 0x2

    field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1

  }










@@ -24788,6 +24789,7 @@ package android.view {













    ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);















    method public boolean gatherTransparentRegion(android.graphics.Region);















    method public android.view.SurfaceHolder getHolder();













    method public void setSecure(boolean);















    method public void setZOrderMediaOverlay(boolean);















    method public void setZOrderOnTop(boolean);















  }

























api/current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -23742,6 +23742,7 @@ package android.view {













    method public deprecated int getWidth();















    method public boolean isValid();















    field public static final int DEFAULT_DISPLAY = 0; // 0x0













    field public static final int FLAG_SECURE = 2; // 0x2















    field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1















  }
























@@ -24788,6 +24789,7 @@ package android.view {













    ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);















    method public boolean gatherTransparentRegion(android.graphics.Region);















    method public android.view.SurfaceHolder getHolder();













    method public void setSecure(boolean);















    method public void setZOrderMediaOverlay(boolean);















    method public void setZOrderOnTop(boolean);















  }

























core/java/android/view/Display.java



+50
−6




























Original line number
Diff line number
Diff line








@@ -82,21 +82,64 @@ public final class Display {













     * Display flag: Indicates that the display supports compositing content















     * that is stored in protected graphics buffers.















     * <p>













     * If this flag is set then the display device supports compositing protected buffers.













     * </p><p>













     * If this flag is not set then the display device may not support compositing













     * protected buffers; the user may see a blank region on the screen instead of













     * the protected content.













     * </p><p>















     * Secure (DRM) video decoders may allocate protected graphics buffers to request that















     * a hardware-protected path be provided between the video decoder and the external















     * display sink.  If a hardware-protected path is not available, then content stored















     * in protected graphics buffers may not be composited.















     * </p><p>













     * If this flag is not set, then the display device does not support compositing













     * protected buffers; the user may see a blank region on the screen instead of













     * the protected content.  An application can use this flag as a hint that it should













     * select an alternate content stream or adopt a different strategy for decoding













     * content that does not rely on protected buffers so as to ensure that the user













     * can view the content on the display as expected.













     * An application can use the absence of this flag as a hint that it should not use protected













     * buffers for this display because the content may not be visible.  For example,













     * if the flag is not set then the application may choose not to show content on this













     * display, show an informative error message, select an alternate content stream













     * or adopt a different strategy for decoding content that does not rely on













     * protected buffers.















     * </p>













     *













     * @see #getFlags















     */















    public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1 << 0;





























    /**













     * Display flag: Indicates that the display has a secure video output and













     * supports compositing secure surfaces.













     * <p>













     * If this flag is set then the display device has a secure video output













     * and is capable of showing secure surfaces.  It may also be capable of













     * showing {@link #FLAG_SUPPORTS_PROTECTED_BUFFERS protected buffers}.













     * </p><p>













     * If this flag is not set then the display device may not have a secure video













     * output; the user may see a blank region on the screen instead of













     * the contents of secure surfaces or protected buffers.













     * </p><p>













     * Secure surfaces are used to prevent content rendered into those surfaces













     * by applications from appearing in screenshots or from being viewed













     * on non-secure displays.  Protected buffers are used by secure video decoders













     * for a similar purpose.













     * </p><p>













     * An application creates a window with a secure surface by specifying the













     * {@link WindowManager.LayoutParams#FLAG_SECURE} window flag.













     * Likewise, an application creates a {@link SurfaceView} with a secure surface













     * by calling {@link SurfaceView#setSecure} before attaching the secure view to













     * its containing window.













     * </p><p>













     * An application can use the absence of this flag as a hint that it should not create













     * secure surfaces or protected buffers on this display because the content may













     * not be visible.  For example, if the flag is not set then the application may













     * choose not to show content on this display, show an informative error message,













     * select an alternate content stream or adopt a different strategy for decoding













     * content that does not rely on secure surfaces or protected buffers.













     * </p>













     *













     * @see #getFlags













     */













    public static final int FLAG_SECURE = 1 << 1;





























    /**















     * Internal method to create a display.















     * Applications should use {@link android.view.WindowManager#getDefaultDisplay()}










@@ -182,6 +225,7 @@ public final class Display {













     * @return The display flags.















     *















     * @see #FLAG_SUPPORTS_PROTECTED_BUFFERS













     * @see #FLAG_SECURE















     */















    public int getFlags() {















        synchronized (this) {

































core/java/android/view/DisplayInfo.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -299,6 +299,9 @@ public final class DisplayInfo implements Parcelable {





























    private static String flagsToString(int flags) {















        StringBuilder result = new StringBuilder();













        if ((flags & Display.FLAG_SECURE) != 0) {













            result.append(", FLAG_SECURE");













        }















        if ((flags & Display.FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) {















            result.append(", FLAG_SUPPORTS_PROTECTED_BUFFERS");















        }

































core/java/android/view/SurfaceView.java



+21
−1




























Original line number
Diff line number
Diff line








@@ -386,6 +386,26 @@ public class SurfaceView extends View {













        }















    }





























    /**













     * Control whether the surface view's content should be treated as secure,













     * preventing it from appearing in screenshots or from being viewed on













     * non-secure displays.













     *













     * <p>Note that this must be set before the surface view's containing













     * window is attached to the window manager.













     *













     * <p>See {@link android.view.Display#FLAG_SECURE} for details.













     *













     * @param isSecure True if the surface view is secure.













     */













    public void setSecure(boolean isSecure) {













        if (isSecure) {













            mLayout.flags |= WindowManager.LayoutParams.FLAG_SECURE;













        } else {













            mLayout.flags &= ~WindowManager.LayoutParams.FLAG_SECURE;













        }













    }





























    /**















     * Hack to allow special layering of windows.  The type is one of the















     * types in WindowManager.LayoutParams.  This is a hack so: