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

Merge "Fix NPE in SyncManager when updating accounts." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-13 20:39:15 +00:00
committed by Android (Google) Code Review
parent 81f5007d5f 190c7017fa
commit a5d32d0375
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3256,16 +3256,19 @@ public class SyncManager {
} }
} }
if (syncTargets != null) {
// On account add, check if there are any settings to be restored. // On account add, check if there are any settings to be restored.
for (AccountAndUser aau : mRunningAccounts) { for (AccountAndUser aau : mRunningAccounts) {
if (!containsAccountAndUser(oldAccounts, aau.account, aau.userId)) { if (!containsAccountAndUser(oldAccounts, aau.account, aau.userId)) {
if (Log.isLoggable(TAG, Log.DEBUG)) { if (Log.isLoggable(TAG, Log.DEBUG)) {
Log.d(TAG, "Account " + aau.account + " added, checking sync restore data"); Log.d(TAG, "Account " + aau.account
+ " added, checking sync restore data");
} }
AccountSyncSettingsBackupHelper.accountAdded(mContext, syncTargets.userId); AccountSyncSettingsBackupHelper.accountAdded(mContext, syncTargets.userId);
break; break;
} }
} }
}
// Cancel all jobs from non-existent accounts. // Cancel all jobs from non-existent accounts.
AccountAndUser[] allAccounts = AccountManagerService.getSingleton().getAllAccounts(); AccountAndUser[] allAccounts = AccountManagerService.getSingleton().getAllAccounts();