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

Commit 3cc321ec authored by Jeff Brown's avatar Jeff Brown
Browse files

Remove dithering support. 

The dithering flag is no longer implemented in Surface Flinger
so this is all dead code.

Change-Id: I74c0e452923207e5b7cfe0eeca9457e5cb990947
parent ef4e817a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25210,7 +25210,7 @@ package android.view { 
    field public static final deprecated int FLAG_BLUR_BEHIND = 4; // 0x4

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

    field public static final int FLAG_DISMISS_KEYGUARD = 4194304; // 0x400000

    field public static final int FLAG_DITHER = 4096; // 0x1000

    field public static final deprecated int FLAG_DITHER = 4096; // 0x1000

    field public static final int FLAG_FORCE_NOT_FULLSCREEN = 2048; // 0x800

    field public static final int FLAG_FULLSCREEN = 1024; // 0x400

    field public static final int FLAG_HARDWARE_ACCELERATED = 16777216; // 0x1000000

core/java/android/view/Surface.java

+0 −3
Original line number Diff line number Diff line
@@ -217,9 +217,6 @@ public class Surface implements Parcelable { 
    /** Hide the surface. Equivalent to calling hide(). @hide */

    public static final int SURFACE_HIDDEN    = 0x01;



    /** Enable dithering when compositing this surface @hide */

    public static final int SURFACE_DITHER    = 0x04;



    // The mSurfaceControl will only be present for Surfaces used by the window

    // server or system processes. When this class is parceled we defer to the

    // mSurfaceControl to do the parceling. Otherwise we parcel the

core/java/android/view/WindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -538,7 +538,9 @@ public interface WindowManager extends ViewManager { 
        public static final int FLAG_FORCE_NOT_FULLSCREEN   = 0x00000800;

        

        /** Window flag: turn on dithering when compositing this window to

         *  the screen. */

         *  the screen.

         * @deprecated This flag is no longer used. */

        @Deprecated

        public static final int FLAG_DITHER             = 0x00001000;

        

        /** Window flag: don't allow screen shots while this window is
@@ -726,7 +728,6 @@ public interface WindowManager extends ViewManager { 
         * @see #FLAG_LAYOUT_NO_LIMITS

         * @see #FLAG_FULLSCREEN

         * @see #FLAG_FORCE_NOT_FULLSCREEN

         * @see #FLAG_DITHER

         * @see #FLAG_SECURE

         * @see #FLAG_SCALED

         * @see #FLAG_IGNORE_CHEEK_PRESSES

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+1 −2
Original line number Diff line number Diff line
@@ -613,8 +613,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                width, WRAP_CONTENT,

                st.x, st.y, WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG,

                WindowManager.LayoutParams.FLAG_DITHER

                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM

                | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                st.decorView.mDefaultOpacity);

services/java/com/android/server/wm/WindowStateAnimator.java

+0 −4
Original line number Diff line number Diff line
@@ -697,10 +697,6 @@ class WindowStateAnimator { 
                    mSurface.setAlpha(0);

                    mSurfaceShown = false;

                    mSurface.hide();

                    if ((mWin.mAttrs.flags&WindowManager.LayoutParams.FLAG_DITHER) != 0) {

                        if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(mWin, "DITHER", null);

                        mSurface.setFlags(Surface.SURFACE_DITHER, Surface.SURFACE_DITHER);

                    }

                } catch (RuntimeException e) {

                    Slog.w(TAG, "Error creating surface in " + w, e);

                    mService.reclaimSomeSurfaceMemoryLocked(this, "create-init", true);