Snap for 5876498 from 035153413e9ec8341c88cfa3ad56934a7f441358 to qt-qpr1-release

Change-Id: I6de874e02d18c8bdab4fe10bcc84b0c0cd60f264

2 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java b/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
index d846ce09..d0ee1809 100644
--- a/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
+++ b/src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java
@@ -34,6 +34,7 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.os.Process;
 import android.os.UserHandle;
 import android.permission.PermissionControllerService;
 import android.permission.PermissionManager;
@@ -569,6 +570,9 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS
         AsyncTask.execute(() -> {
             onGrantOrUpgradeDefaultRuntimePermissions();
             callback.run();
+
+            // Async part
+            Utils.updateUserSensitive(getApplication(), Process.myUserHandle());
         });
     }
 
diff --git a/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java b/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
index 1ba0e0ff..fde630b5 100644
--- a/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
+++ b/src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java
@@ -29,7 +29,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
 import com.android.packageinstaller.permission.utils.CollectionUtils;
-import com.android.packageinstaller.permission.utils.Utils;
 import com.android.packageinstaller.role.model.Role;
 import com.android.packageinstaller.role.model.Roles;
 import com.android.packageinstaller.role.utils.PackageUtils;
@@ -169,10 +168,6 @@ public class RoleControllerServiceImpl extends RoleControllerService {
             }
         }
 
-        // Load data on this thread instead of background.
-        // TODO: Move out of this thread
-        Utils.updateUserSensitive(getApplication(), Process.myUserHandle());
-
         return true;
     }