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

Commit 6c612fea authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Move from getDataUserCePackageDirectory to getDataSystemCeDirectory."... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13989168

Change-Id: I8e6738c704e44f0e2ef952f9cc864175587e47da
parents 1e605a6f b3c71c2f

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

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

import android.os.Environment;

import android.os.UserHandle;

import android.os.storage.StorageManager;

import android.util.SparseArray;



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


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

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

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

        File userCeDir =

                Environment.getDataUserCePackageDirectory(

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

        return new File(userCeDir, APP_SEARCH_DIR);

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

    }



    /**