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

Commit 8921dc34 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "NetworkCapabilities needs UID to be satisfied."

parents f0b6a9a2 fb0f9717

services/core/java/com/android/server/job/controllers/JobStatus.java

+7 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ public final class JobStatus { 
        this.numFailures = numFailures;



        int requiredConstraints = job.getConstraintFlags();



        if (job.getRequiredNetwork() != null) {

            requiredConstraints |= CONSTRAINT_CONNECTIVITY;

        }
@@ -323,6 +322,13 @@ public final class JobStatus { 
        mInternalFlags = internalFlags;



        updateEstimatedNetworkBytesLocked();



        if (job.getRequiredNetwork() != null) {

            // Later, when we check if a given network satisfies the required

            // network, we need to know the UID that is requesting it, so push

            // our source UID into place.

            job.getRequiredNetwork().networkCapabilities.setSingleUid(this.sourceUid);

        }

    }



    /** Copy constructor: used specifically when cloning JobStatus objects for persistence,