Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup the public API getActiveNetworkForUid on AOSP"

Browse Source
This commit is contained in:
Frank Li
2021-07-14 16:23:20 +00:00
committed by Gerrit Code Review
parent 64d9c2c25b d44ddbdfad
commit 06c19fa5d4
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));