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

Commit a5e295da authored by Eden Mendel's avatar Eden Mendel Committed by Android (Google) Code Review
Browse files

Merge "[Flag Removal] Remove flag com.android.window.flags.scramble_snapshot_file_name" into main

parents f0b15c34 76e70dd1

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

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

}



flag {

    name: "scramble_snapshot_file_name"

    namespace: "windowing_frontend"

    description: "Scramble the file name of task snapshot."

    bug: "293139053"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_handlers_debugging_mode"

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

+3 −6
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.util.SparseBooleanArray; 
import android.window.TaskSnapshot;



import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;



import java.io.File;

import java.util.UUID;
@@ -128,12 +127,10 @@ class BaseAppSnapshotPersister { 


        @NonNull

        File getDirectory(int userId) {

            if (Flags.scrambleSnapshotFileName()) {

            final File directory = getOrInitScrambleDirectory(userId);

            if (directory != null) {

                return directory;

            }

            }

            return getBaseDirectory(userId);

        }

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

+1 −7
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ import android.window.TaskSnapshot; 
import com.android.server.LocalServices;

import com.android.server.pm.UserManagerInternal;

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

import com.android.window.flags.Flags;



import org.junit.After;

import org.junit.AfterClass;

import org.junit.Before;
@@ -149,11 +147,7 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase { 
    File[] convertFilePath(@NonNull String... fileNames) {

        final File[] files = new File[fileNames.length];

        final String path;

        if (Flags.scrambleSnapshotFileName()) {

        path = mPersister.mPersistInfoProvider.getDirectory(mTestUserId).getPath();

        } else {

            path = FILES_DIR.getPath() + "/snapshots/";

        }

        for (int i = 0; i < fileNames.length; i++) {

            files[i] = new File(path, fileNames[i]);

        }