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

Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev

Browse Source
This commit is contained in:
Jian Sun
2017-06-07 20:31:00 +00:00
committed by Android (Google) Code Review
parent 6e96251d92 066aa5ed71
commit 8d5b58a660
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -751,6 +751,11 @@ public class AccountManagerService
}
}
private boolean isVisible(int visibility) {
return visibility == AccountManager.VISIBILITY_VISIBLE ||
visibility == AccountManager.VISIBILITY_USER_MANAGED_VISIBLE;
}
/**
* Updates visibility for given account name and package.
*
@@ -803,8 +808,10 @@ public class AccountManagerService
if (notify) {
for (Entry<String, Integer> packageToVisibility : packagesToVisibility
.entrySet()) {
if (shouldNotifyOnVisibilityChange(packageToVisibility.getValue(),
resolveAccountVisibility(account, packageName, accounts))) {
int oldVisibility = packageToVisibility.getValue();
int currentVisibility =
resolveAccountVisibility(account, packageName, accounts);
if (isVisible(oldVisibility) != isVisible(currentVisibility)) {
notifyPackage(packageToVisibility.getKey(), accounts);
}
}
@@ -1181,8 +1188,7 @@ public class AccountManagerService
for (Entry<String, Integer> packageToVisibility :
packagesToVisibility.entrySet()) {
if (shouldNotifyOnVisibilityChange(packageToVisibility.getValue(),
AccountManager.VISIBILITY_NOT_VISIBLE)) {
if (isVisible(packageToVisibility.getValue())) {
notifyPackage(packageToVisibility.getKey(), accounts);
}
}
@@ -1218,14 +1224,6 @@ public class AccountManagerService
}
}
private boolean shouldNotifyOnVisibilityChange(int oldVisibility, int newVisibility) {
boolean oldVisible = (oldVisibility == AccountManager.VISIBILITY_VISIBLE) ||
(oldVisibility == AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
boolean newVisible = (newVisibility == AccountManager.VISIBILITY_VISIBLE) ||
(newVisibility == AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
return oldVisible == newVisible;
}
private SparseBooleanArray getUidsOfInstalledOrUpdatedPackagesAsUser(int userId) {
// Get the UIDs of all apps that might have data on the device. We want
// to preserve user data if the app might otherwise be storing data.