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

Merge "Don't purge *all* sync information when a user is deleted." into qt-dev

Browse Source 
am: e74523c9fb

Change-Id: I5aa7e1362d03f845fad90310ef026d5ff24325b4
This commit is contained in:
Makoto Onuki
2019-05-22 15:42:23 -07:00
committed by android-build-merger
parent 5e3544aa97 e74523c9fb
commit dccff8d4aa
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -1170,7 +1170,7 @@ public class SyncManager {
} }
private void removeSyncsForAuthority(EndPoint info, String why) { private void removeSyncsForAuthority(EndPoint info, String why) {
mLogger.log("removeSyncsForAuthority: ", info); mLogger.log("removeSyncsForAuthority: ", info, why);
verifyJobScheduler(); verifyJobScheduler();
List<SyncOperation> ops = getAllPendingSyncs(); List<SyncOperation> ops = getAllPendingSyncs();
for (SyncOperation op: ops) { for (SyncOperation op: ops) {

10
services/core/java/com/android/server/content/SyncStorageEngine.java
View File

@@ -1027,7 +1027,7 @@ public class SyncStorageEngine {
* Called when the set of account has changed, given the new array of * Called when the set of account has changed, given the new array of
* active accounts. * active accounts.
*/ */
public void removeStaleAccounts(@Nullable Account[] accounts, int userId) { public void removeStaleAccounts(@Nullable Account[] currentAccounts, int userId) {
synchronized (mAuthorities) { synchronized (mAuthorities) {
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (Log.isLoggable(TAG, Log.VERBOSE)) {
Slog.v(TAG, "Updating for new accounts..."); Slog.v(TAG, "Updating for new accounts...");
@@ -1036,9 +1036,11 @@ public class SyncStorageEngine {
Iterator<AccountInfo> accIt = mAccounts.values().iterator(); Iterator<AccountInfo> accIt = mAccounts.values().iterator();
while (accIt.hasNext()) { while (accIt.hasNext()) {
AccountInfo acc = accIt.next(); AccountInfo acc = accIt.next();
if ((accounts == null) || ( if (acc.accountAndUser.userId != userId) {
(acc.accountAndUser.userId == userId) continue; // Irrelevant user.
&& !ArrayUtils.contains(accounts, acc.accountAndUser.account))) { }
if ((currentAccounts == null)
|| !ArrayUtils.contains(currentAccounts, acc.accountAndUser.account)) {
// This account no longer exists... // This account no longer exists...
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (Log.isLoggable(TAG, Log.VERBOSE)) {
Slog.v(TAG, "Account removed: " + acc.accountAndUser); Slog.v(TAG, "Account removed: " + acc.accountAndUser);