Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev

am: 1fab6234c0 Change-Id: I90b209f4077d858b6a801dd7a195e0c4e268df4c
2017-08-24 21:03:54 +00:00
parent b922ede46a 1fab6234c0
commit a750014a6d
1 changed files with 10 additions and 0 deletions
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -3780,6 +3780,16 @@ public class SyncManager {
        if (!op.isPeriodic){
            return false;
        }
+        boolean found = false;
+        for (UserInfo user : UserManager.get(mContext).getUsers(/*excludeDying=*/ true)) {
+            if (op.target.userId == user.id) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            return false; // User is being removed, okay.
+        }
        switch (op.target.provider) {
            case "gmail-ls":
            case "com.android.contacts.metadata":