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

Commit 5272d7c9 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Remove flag exclude_drawing_app_theme_snapshot_from_lock" into main

parents 093b1c36 c65ffb8f

core/java/android/window/flags/windowing_frontend.aconfig

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

}



flag {

    name: "exclude_drawing_app_theme_snapshot_from_lock"

    namespace: "windowing_frontend"

    description: "Do not hold wm lock when drawing app theme snapshot."

    is_fixed_read_only: true

    bug: "373502791"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "reduce_changed_exclusion_rects_msgs"

    namespace: "windowing_frontend"

services/core/java/com/android/server/wm/AbsAppSnapshotController.java

+2 −8
Original line number Diff line number Diff line
@@ -165,15 +165,9 @@ abstract class AbsAppSnapshotController<TYPE extends WindowContainer, 
        switch (getSnapshotMode(source)) {

            case SNAPSHOT_MODE_APP_THEME:

                Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "drawAppThemeSnapshot");

                if (Flags.excludeDrawingAppThemeSnapshotFromLock()) {

                if (allowAppTheme) {

                    supplier.setSupplier(drawAppThemeSnapshot(source));

                }

                } else {

                    final Supplier<TaskSnapshot> original = drawAppThemeSnapshot(source);

                    final TaskSnapshot snapshot = original != null ? original.get() : null;

                    supplier.setSnapshot(snapshot);

                }

                Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                break;

            case SNAPSHOT_MODE_REAL:

services/core/java/com/android/server/wm/TaskSnapshotController.java

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.window.TaskSnapshot; 


import com.android.server.policy.WindowManagerPolicy.ScreenOffListener;

import com.android.server.wm.BaseAppSnapshotPersister.PersistInfoProvider;

import com.android.window.flags.Flags;



import java.util.ArrayList;
@@ -140,7 +139,7 @@ class TaskSnapshotController extends AbsAppSnapshotController<Task, TaskSnapshot 
            return;

        }

        final int mode = getSnapshotMode(task);

        if (Flags.excludeDrawingAppThemeSnapshotFromLock() && mode == SNAPSHOT_MODE_APP_THEME) {

        if (mode == SNAPSHOT_MODE_APP_THEME) {

            mService.mH.post(supplier::handleSnapshot);

        } else {

            supplier.handleSnapshot();

services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java

+0 −4
Original line number Diff line number Diff line
@@ -46,14 +46,11 @@ import android.graphics.PixelFormat; 
import android.graphics.Point;

import android.graphics.Rect;

import android.hardware.HardwareBuffer;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.window.TaskSnapshot;



import androidx.test.filters.SmallTest;



import com.android.window.flags.Flags;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mockito;
@@ -229,7 +226,6 @@ public class TaskSnapshotControllerTest extends WindowTestsBase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_EXCLUDE_DRAWING_APP_THEME_SNAPSHOT_FROM_LOCK)

    public void testRecordTaskSnapshot() {

        spyOn(mWm.mTaskSnapshotController.mCache);

        spyOn(mWm.mTaskSnapshotController);