summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-09-12 03:26:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-12 03:26:36 +0000
commit035153413e9ec8341c88cfa3ad56934a7f441358 (patch)
tree5d462ae93eafaad6aa803c05b565cefaddc805ea
parent076bb687968186c65bb429b5257d72598a1d594c (diff)
parent2053fa84e15492670692cb13bbe05748e84b2ebe (diff)
downloadandroid_packages_apps_PackageInstaller-035153413e9ec8341c88cfa3ad56934a7f441358.tar.gz
android_packages_apps_PackageInstaller-035153413e9ec8341c88cfa3ad56934a7f441358.tar.bz2
android_packages_apps_PackageInstaller-035153413e9ec8341c88cfa3ad56934a7f441358.zip
Merge "updateUserSensitive asynchronously" into qt-qpr1-dev
-rw-r--r--src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java4
-rw-r--r--src/com/android/packageinstaller/role/service/RoleControllerServiceImpl.java5
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;
}