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

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

Merge "Remove flag activity_snapshot_by_default" into main

parents ed8b631f 1f0b9311

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

+0 −8
Original line number Diff line number Diff line
@@ -93,14 +93,6 @@ flag { 
    bug: "320510464"

}



flag {

    name: "activity_snapshot_by_default"

    namespace: "systemui"

    description: "Enable record activity snapshot by default"

    bug: "259497289"

    is_fixed_read_only: true

}



flag {

    name: "supports_multi_instance_system_ui"

    is_exported: true

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

+0 −9
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.Nullable; 
import android.app.ActivityManager;

import android.graphics.Rect;

import android.os.Environment;

import android.os.SystemProperties;

import android.os.Trace;

import android.util.ArraySet;

import android.util.IntArray;
@@ -33,7 +32,6 @@ import android.window.TaskSnapshot; 


import com.android.internal.annotations.VisibleForTesting;

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

import com.android.window.flags.Flags;



import java.io.File;

import java.io.PrintWriter;
@@ -109,7 +107,6 @@ class ActivitySnapshotController extends AbsAppSnapshotController<ActivityRecord 
                !service.mContext

                        .getResources()

                        .getBoolean(com.android.internal.R.bool.config_disableTaskSnapshots)

                && isSnapshotEnabled()

                && !ActivityManager.isLowRamDeviceStatic(); // Don't support Android Go

        setSnapshotEnabled(snapshotEnabled);

    }
@@ -121,12 +118,6 @@ class ActivitySnapshotController extends AbsAppSnapshotController<ActivityRecord 
        return Math.max(Math.min(config, 1f), 0.1f);

    }



    // TODO remove when enabled

    static boolean isSnapshotEnabled() {

        return SystemProperties.getInt("persist.wm.debug.activity_screenshot", 0) != 0

                || Flags.activitySnapshotByDefault();

    }



    static PersistInfoProvider createPersistInfoProvider(

            WindowManagerService service, BaseAppSnapshotPersister.DirectoryResolver resolver) {

        // Don't persist reduced file, instead we only persist the "HighRes" bitmap which has

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

+1 −2
Original line number Diff line number Diff line
@@ -963,8 +963,7 @@ class BackNavigationController { 
            mWindowManagerService = wms;

            final Context context = wms.mContext;

            mShowWindowlessSurface = context.getResources().getBoolean(

                    com.android.internal.R.bool.config_predictShowStartingSurface)

                    && Flags.activitySnapshotByDefault();

                    com.android.internal.R.bool.config_predictShowStartingSurface);

        }

        private static final int UNKNOWN = 0;

        private static final int TASK_SWITCH = 1;