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

Commit 7a1ad6d9 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Remove a compat hack SurfaceView#setWindowType() 

This CL logically reverts a compatibility hack I introduced [1] for
apps that had relied on @hide method SurfaceView#setWindowType(int).

 [1]: I5217f6417a73690ae8a978754218b7b089070fdd
      3b5011af

Fixes: 62054282
Test: Manually verified that Bug 36345857 is still not reproducible
Change-Id: Icee198c554de558cfa4ffe0b264064969839654e
parent bf7ceec0

core/java/android/view/SurfaceView.java

+0 −26
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.view;



import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;

import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_OVERLAY_SUBLAYER;

import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_SUBLAYER;

import static android.view.WindowManagerPolicy.APPLICATION_PANEL_SUBLAYER;
@@ -872,31 +871,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
        return callbacks;

    }



    /**

     * This method still exists only for compatibility reasons because some applications have relied

     * on this method via reflection. See Issue 36345857 for details.

     *

     * @deprecated No platform code is using this method anymore.

     * @hide

     */

    @Deprecated

    public void setWindowType(int type) {

        if (getContext().getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O) {

            throw new UnsupportedOperationException(

                    "SurfaceView#setWindowType() has never been a public API.");

        }



        if (type == TYPE_APPLICATION_PANEL) {

            Log.e(TAG, "If you are calling SurfaceView#setWindowType(TYPE_APPLICATION_PANEL) "

                    + "just to make the SurfaceView to be placed on top of its window, you must "

                    + "call setZOrderOnTop(true) instead.", new Throwable());

            setZOrderOnTop(true);

            return;

        }

        Log.e(TAG, "SurfaceView#setWindowType(int) is deprecated and now does nothing. "

                + "type=" + type, new Throwable());

    }



    private void runOnUiThread(Runnable runnable) {

        Handler handler = getHandler();

        if (handler != null && handler.getLooper() != Looper.myLooper()) {