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

Commit de88b04b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only clear preferred UID at appropriate times." into tm-dev am: 82100c9d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17413283



Change-Id: Ie504fd4a70b947de262e5b25ddb83980afa4ed10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fe5b9eb 82100c9d

apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java

+2 −5
Original line number Diff line number Diff line
@@ -686,9 +686,6 @@ class JobConcurrencyManager { 
                            stoppable.removeAt(s);

                            assignment.newJob = nextPending;

                            assignment.newWorkType = replaceWorkType;

                            // Don't preserve the UID since we're stopping the job because

                            // something is pending (eg. EJs).

                            assignment.context.clearPreferredUid();

                            break;

                        }

                    }
@@ -769,20 +766,20 @@ class JobConcurrencyManager { 
        }

        for (int s = stoppable.size() - 1; s >= 0; --s) {

            final ContextAssignment assignment = stoppable.valueAt(s);

            // The preferred UID is set when we cancel with PREEMPT reason, but don't preserve the

            // UID for any stoppable contexts since we want to open the context up to any/all apps.

            assignment.context.clearPreferredUid();

            assignment.clear();

            mContextAssignmentPool.release(assignment);

        }

        for (int p = preferredUidOnly.size() - 1; p >= 0; --p) {

            final ContextAssignment assignment = preferredUidOnly.valueAt(p);

            assignment.context.clearPreferredUid();

            assignment.clear();

            mContextAssignmentPool.release(assignment);

        }

        for (int i = idle.size() - 1; i >= 0; --i) {

            final ContextAssignment assignment = idle.valueAt(i);

            mIdleContexts.add(assignment.context);

            assignment.context.clearPreferredUid();

            assignment.clear();

            mContextAssignmentPool.release(assignment);

        }