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

Commit a8b2994f authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 06c19fa5 

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

Change-Id: I0bb6bf4e077cc26ffba9e608ce83fd32f56de9fc
parents a164bded 06c19fa5

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+15 −3
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.server.job.JobSchedulerService.Constants; 
import com.android.server.job.StateControllerProto;

import com.android.server.job.StateControllerProto;

import com.android.server.net.NetworkPolicyManagerInternal;

import com.android.server.net.NetworkPolicyManagerInternal;





import java.lang.reflect.InvocationTargetException;

import java.util.Objects;

import java.util.Objects;

import java.util.function.Predicate;

import java.util.function.Predicate;
@@ -460,8 +461,19 @@ public final class ConnectivityController extends RestrictingController implemen 
        }

        }

    }

    }





    private Network getActiveNetworkForUid(int uid)  {

        try {

            return (Network) mConnManager.getClass()

                    .getMethod("getActiveNetworkForUid", int.class)

                    .invoke(mConnManager, uid);

        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {

            throw new IllegalStateException(

                    "Unable to call getActiveNetworkForUid: ", e);

        }

    }



    private boolean updateConstraintsSatisfied(JobStatus jobStatus)  {

    private boolean updateConstraintsSatisfied(JobStatus jobStatus)  {

        final Network network = mConnManager.getActiveNetworkForUid(jobStatus.getSourceUid());

        final Network network = getActiveNetworkForUid(jobStatus.getSourceUid());

        final NetworkCapabilities capabilities = getNetworkCapabilities(network);

        final NetworkCapabilities capabilities = getNetworkCapabilities(network);

        return updateConstraintsSatisfied(jobStatus, network, capabilities);

        return updateConstraintsSatisfied(jobStatus, network, capabilities);

    }

    }
@@ -522,7 +534,7 @@ public final class ConnectivityController extends RestrictingController implemen 
            return false;

            return false;

        }

        }





        final Network network = mConnManager.getActiveNetworkForUid(jobs.valueAt(0).getSourceUid());

        final Network network = getActiveNetworkForUid(jobs.valueAt(0).getSourceUid());

        final NetworkCapabilities capabilities = getNetworkCapabilities(network);

        final NetworkCapabilities capabilities = getNetworkCapabilities(network);

        final boolean networkMatch = (filterNetwork == null

        final boolean networkMatch = (filterNetwork == null

                || Objects.equals(filterNetwork, network));

                || Objects.equals(filterNetwork, network));