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

Commit 9be0b72e authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Taking userId into account for fixupAppDir()." into rvc-dev am: 84825abd am: 20789d9a 

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

Change-Id: I322a111007e817f45b1e0998d82a23e403bc609c
parents 27d7f84a 20789d9a

services/core/java/com/android/server/StorageManagerService.java

+14 −7
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.internal.util.Preconditions;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.pm.Installer;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.storage.AppFuseBridge;

import com.android.server.storage.StorageSessionController;

import com.android.server.storage.StorageSessionController.ExternalStorageServiceException;
@@ -3343,15 +3342,23 @@ class StorageManagerService extends IStorageManager.Stub 
    public void fixupAppDir(String path) {

        final Matcher matcher = KNOWN_APP_DIR_PATHS.matcher(path);

        if (matcher.matches()) {

            AndroidPackage pkg = mPmInternal.getPackage(matcher.group(3));

            if (pkg != null) {

            if (matcher.group(2) == null) {

                Log.e(TAG, "Asked to fixup an app dir without a userId: " + path);

                return;

            }

            try {

                int userId = Integer.parseInt(matcher.group(2));

                String packageName = matcher.group(3);

                int uid = mContext.getPackageManager().getPackageUidAsUser(packageName, userId);

                try {

                    mVold.fixupAppDir(path + "/", pkg.getUid());

                    mVold.fixupAppDir(path + "/", uid);

                } catch (RemoteException | ServiceSpecificException e) {

                    Log.e(TAG, "Failed to fixup app dir for " + pkg.getPackageName(), e);

                    Log.e(TAG, "Failed to fixup app dir for " + packageName, e);

                }

            } else {

                Log.e(TAG, "Can't find package belonging to " + path);

            } catch (NumberFormatException e) {

                Log.e(TAG, "Invalid userId in path: " + path, e);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "Couldn't find package to fixup app dir " + path, e);

            }

        } else {

            Log.e(TAG, "Path " + path + " is not a valid application-specific directory");