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

Commit 3e3d5cd3 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Cleanup no_duplicate_surface_destroyed_events" into main

parents 6ae73da2 8973f90d

core/java/android/service/wallpaper/WallpaperService.java

+2 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; 
import static android.view.flags.Flags.disableDrawWakeLock;



import static com.android.window.flags.Flags.FLAG_OFFLOAD_COLOR_EXTRACTION;

import static com.android.window.flags.Flags.noDuplicateSurfaceDestroyedEvents;

import static com.android.window.flags.Flags.noConsecutiveVisibilityEvents;

import static com.android.window.flags.Flags.offloadColorExtraction;
@@ -1129,9 +1128,7 @@ public abstract class WallpaperService extends Service { 
            out.print(prefix); out.print("mDisplay="); out.println(mDisplay);

            out.print(prefix); out.print("mCreated="); out.print(mCreated);

                    out.print(" mSurfaceCreated="); out.print(mSurfaceCreated);

                    if (noDuplicateSurfaceDestroyedEvents()) {

                    out.print(" mReportedSurfaceCreated="); out.print(mReportedSurfaceCreated);

                    }

                    out.print(" mIsCreating="); out.print(mIsCreating);

                    out.print(" mDrawingAllowed="); out.println(mDrawingAllowed);

            out.print(prefix); out.print("mWidth="); out.print(mWidth);
@@ -2343,8 +2340,7 @@ public abstract class WallpaperService extends Service { 
        }



        void reportSurfaceDestroyed() {

            if ((!noDuplicateSurfaceDestroyedEvents() && mSurfaceCreated)

                    || (noDuplicateSurfaceDestroyedEvents() && mReportedSurfaceCreated)) {

            if (mReportedSurfaceCreated) {

                mSurfaceCreated = false;

                mReportedSurfaceCreated = false;

                mSurfaceHolder.ungetCallbacks();

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

+0 −10
Original line number Diff line number Diff line
@@ -34,16 +34,6 @@ flag { 
  }

}



flag {

  name: "no_duplicate_surface_destroyed_events"

  namespace: "systemui"

  description: "Prevent the system from sending onSurfaceDestroyed() twice."

  bug: "344461715"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "avoid_rebinding_intentionally_disconnected_wallpaper"

  namespace: "systemui"