Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a750014a authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

am: 1fab6234

Change-Id: I90b209f4077d858b6a801dd7a195e0c4e268df4c
parents b922ede4 1fab6234

services/core/java/com/android/server/content/SyncManager.java

+10 −0
Original line number Diff line number Diff line
@@ -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":