Merge "Fix data migration after appId change" am: d17ebebe81 am: c7a9c2663b am: 49b9847253 am: 475faea51a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1977830

Change-Id: I3e19f614a25e9d53c4ecadecb8967540a7a2e902

1 files changed, 3 insertions, 3 deletions

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 2207405341..240e6be2c4 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -698,9 +698,6 @@ binder::Status InstalldNativeService::createAppDataLocked(
         if (!status.isOk()) {
             return status;
         }
-        if (previousUid != uid) {
-            chown_app_profile_dir(packageName, appId, userId);
-        }
 
         // Remember inode numbers of cache directories so that we can clear
         // contents while CE storage is locked
@@ -726,6 +723,9 @@ binder::Status InstalldNativeService::createAppDataLocked(
         if (!status.isOk()) {
             return status;
         }
+        if (previousUid != uid) {
+            chown_app_profile_dir(packageName, appId, userId);
+        }
 
         if (!prepare_app_profile_dir(packageName, appId, userId)) {
             return error("Failed to prepare profiles for " + packageName);