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

Commit 81aefa64 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Remove addSchandleToVriSurface flag 

Test: presubmit
Flag: EXEMPT flag cleanup
Bug: 439061338
Change-Id: Ifb32008b7b18087998ace0442860b2ab7dcb69db
parent fcdf8e31

core/java/android/view/ViewRootImpl.java

+1 −6
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED; 
import static android.view.accessibility.Flags.a11ySequentialFocusStartingPoint;

import static android.view.accessibility.Flags.forceInvertColor;

import static android.view.accessibility.Flags.reduceWindowContentChangedEventThrottle;

import static android.view.flags.Flags.addSchandleToVriSurface;

import static android.view.flags.Flags.disableDrawWakeLock;

import static android.view.flags.Flags.sensitiveContentAppProtection;

import static android.view.flags.Flags.sensitiveContentPrematureProtectionRemovedFix;
@@ -2855,11 +2854,7 @@ public final class ViewRootImpl implements ViewParent, 
        mBlastBufferQueue.setWaitForBufferReleaseCallback(mChoreographer::onWaitForBufferRelease);

        mBlastBufferQueue.setCornerRadiiCallback(mCornerRadiiCallback);

        Surface blastSurface;

        if (addSchandleToVriSurface()) {

        blastSurface = mBlastBufferQueue.createSurfaceWithHandle();

        } else {

            blastSurface = mBlastBufferQueue.createSurface();

        }

        // Only call transferFrom if the surface has changed to prevent inc the generation ID and

        // causing EGL resources to be recreated.

        mSurface.transferFrom(blastSurface);

core/java/android/view/flags/view_flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -80,17 +80,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "add_schandle_to_vri_surface"

    namespace: "window_surfaces"

    description: "Add surface control handle to VRI Surface"

    bug: "320706287"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "disable_draw_wake_lock"

    namespace: "wear_frameworks"

core/tests/coretests/src/android/view/ViewRootImplTest.java

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; 
import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;

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

import static android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR;

import static android.view.flags.Flags.FLAG_ADD_SCHANDLE_TO_VRI_SURFACE;

import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY;

import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY;

import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API;
@@ -1610,7 +1609,6 @@ public class ViewRootImplTest { 
    }



    @Test

    @RequiresFlagsEnabled({FLAG_ADD_SCHANDLE_TO_VRI_SURFACE})

    public void testASurfaceControl_createFromWindow() throws Throwable {

        mView = new View(sContext);

        attachViewToWindow(mView);