Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev

import android.os.Environment;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.Log;

import com.android.internal.annotations.GuardedBy;

import com.android.server.appsearch.external.localstorage.AppSearchImpl;

 * Manages the lifecycle of instances of {@link AppSearchImpl}.

 *

 * <p>These instances are managed per unique device-user.

 * @hide

 */

public final class ImplInstanceManager {

    private static final String APP_SEARCH_DIR = "appSearch";

    private static final String TAG = "AppSearchImplInstanceMa";

    private static ImplInstanceManager sImplInstanceManager;

     * <p>This folder should only be accessed after unlock.

     */

    public static File getAppSearchDir(@NonNull UserHandle userHandle) {

        return new File(

                Environment.getDataSystemCeDirectory(userHandle.getIdentifier()), APP_SEARCH_DIR);

        // Duplicates the implementation of Environment#getDataSystemCeDirectory

        // TODO(b/191059409): Unhide Environment#getDataSystemCeDirectory and switch to it.

        File systemCeDir = new File(Environment.getDataDirectory(), "system_ce");

        File systemCeUserDir = new File(systemCeDir, String.valueOf(userHandle.getIdentifier()));

        return new File(systemCeUserDir, "appSearch");

    }

    /**

            @Nullable AppSearchLogger logger)

            throws AppSearchException {

        File appSearchDir = getAppSearchDir(userHandle);

        File icingDir = new File(appSearchDir, "icing");

        Log.i(TAG, "Creating new AppSearch instance at: " + icingDir);

        return AppSearchImpl.create(

                appSearchDir,

                icingDir,

                userContext,

                /*logger=*/ null,

                new FrameworkOptimizeStrategy());