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

Commit b3c71c2f authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

Merge "Move from getDataUserCePackageDirectory to getDataSystemCeDirectory." into sc-dev

parents aeb2ba8d 75962baf

apex/appsearch/service/java/com/android/server/appsearch/ImplInstanceManager.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.os.Environment;

import android.os.Environment;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.util.SparseArray;

import android.util.SparseArray;





import com.android.internal.R;

import com.android.internal.R;
@@ -130,11 +129,7 @@ public final class ImplInstanceManager { 




    private static File getAppSearchDir(@NonNull Context context, @UserIdInt int userId) {

    private static File getAppSearchDir(@NonNull Context context, @UserIdInt int userId) {

        // See com.android.internal.app.ChooserActivity::getPinnedSharedPrefs

        // See com.android.internal.app.ChooserActivity::getPinnedSharedPrefs

        //TODO(b/177685938):Switch from getDataUserCePackageDirectory to getDataSystemCeDirectory

        return new File(Environment.getDataSystemCeDirectory(userId), APP_SEARCH_DIR);

        File userCeDir =

                Environment.getDataUserCePackageDirectory(

                        StorageManager.UUID_PRIVATE_INTERNAL, userId, context.getPackageName());

        return new File(userCeDir, APP_SEARCH_DIR);

    }

    }





    /**

    /**