Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PackageManager: Create missing userdata directory" am: c04ae660f4 am: d336103b17 am: b0576959ef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646419

Change-Id: I5803d7e8d1da9671b609e260d6568a126940a0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-07-05 22:35:57 +00:00
committed by Automerger Merge Worker
parent cda637b4e3 b0576959ef
commit bc3e90134d
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/pm/MovePackageHelper.java
View File

@@ -35,6 +35,7 @@ import android.content.pm.IPackageMoveObserver;
import android.content.pm.PackageInstaller;
import android.content.pm.PackageManager;
import android.content.pm.PackageStats;
import android.content.pm.UserInfo;
import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.PackageLite;
import android.content.pm.parsing.result.ParseResult;
@@ -49,6 +50,7 @@ import android.os.RemoteException;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.text.TextUtils;
import android.util.MathUtils;
import android.util.Slog;
import android.util.SparseIntArray;
@@ -220,6 +222,16 @@ public final class MovePackageHelper {
"Not enough free space to move");
}
try {
for (int index = 0; index < installedUserIds.length; index++) {
prepareUserDataForVolumeIfRequired(volumeUuid, installedUserIds[index], storage);
}
} catch (RuntimeException e) {
freezer.close();
throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR,
"Failed to prepare user storage while moving app");
}
mPm.mMoveCallbacks.notifyStatusChanged(moveId, 10);
final CountDownLatch installedLatch = new CountDownLatch(1);
@@ -366,6 +378,29 @@ public final class MovePackageHelper {
return true;
}
private void prepareUserDataForVolumeIfRequired(String volumeUuid, int userId,
StorageManager storageManager) {
if (TextUtils.isEmpty(volumeUuid)
|| doesDataDirectoryExistForUser(volumeUuid, userId)) {
return;
}
if (DEBUG_INSTALL) {
Slog.d(TAG, "Preparing user directories for user u" + userId + " for UUID "
+ volumeUuid);
}
final UserInfo user = mPm.mUserManager.getUserInfo(userId);
if (user == null) return;
// This call is same as StorageEventHelper#loadPrivatePackagesInner which prepares
// the storage before reconciling apps
storageManager.prepareUserStorage(volumeUuid, user.id, user.serialNumber,
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
}
private boolean doesDataDirectoryExistForUser(String uuid, int userId) {
final File userDirectoryFile = Environment.getDataUserCeDirectory(uuid, userId);
return userDirectoryFile != null && userDirectoryFile.exists();
}
public static class MoveCallbacks extends Handler {
private static final int MSG_CREATED = 1;
private static final int MSG_STATUS_CHANGED = 2;