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

Merge "[JS02]Remove hidden API usage of NetworkRequest.networkCapabilities"

Browse Source
This commit is contained in:
Frank Li
2021-03-30 07:22:40 +00:00
committed by Gerrit Code Review
parent 46196fb05a 2b3fcc5c57
commit 3eee37a29d
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static com.android.server.job.JobSchedulerService.RESTRICTED_INDEX; import static com.android.server.job.JobSchedulerService.RESTRICTED_INDEX;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.job.JobInfo; import android.app.job.JobInfo;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -373,15 +374,23 @@ public final class ConnectivityController extends RestrictingController implemen
} }
} }
private static NetworkCapabilities.Builder copyCapabilities(
@NonNull final NetworkRequest request) {
final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder();
for (int transport : request.getTransportTypes()) builder.addTransportType(transport);
for (int capability : request.getCapabilities()) builder.addCapability(capability);
return builder;
}
private static boolean isStrictSatisfied(JobStatus jobStatus, Network network, private static boolean isStrictSatisfied(JobStatus jobStatus, Network network,
NetworkCapabilities capabilities, Constants constants) { NetworkCapabilities capabilities, Constants constants) {
// A restricted job that's out of quota MUST use an unmetered network. // A restricted job that's out of quota MUST use an unmetered network.
if (jobStatus.getEffectiveStandbyBucket() == RESTRICTED_INDEX if (jobStatus.getEffectiveStandbyBucket() == RESTRICTED_INDEX
&& !jobStatus.isConstraintSatisfied(JobStatus.CONSTRAINT_WITHIN_QUOTA)) { && !jobStatus.isConstraintSatisfied(JobStatus.CONSTRAINT_WITHIN_QUOTA)) {
final NetworkCapabilities required = new NetworkCapabilities.Builder( final NetworkCapabilities.Builder builder =
jobStatus.getJob().getRequiredNetwork().networkCapabilities) copyCapabilities(jobStatus.getJob().getRequiredNetwork());
.addCapability(NET_CAPABILITY_NOT_METERED).build(); builder.addCapability(NET_CAPABILITY_NOT_METERED);
return required.satisfiedByNetworkCapabilities(capabilities); return builder.build().satisfiedByNetworkCapabilities(capabilities);
} else { } else {
return jobStatus.getJob().getRequiredNetwork().canBeSatisfiedBy(capabilities); return jobStatus.getJob().getRequiredNetwork().canBeSatisfiedBy(capabilities);
} }
@@ -395,10 +404,10 @@ public final class ConnectivityController extends RestrictingController implemen
} }
// See if we match after relaxing any unmetered request // See if we match after relaxing any unmetered request
final NetworkCapabilities relaxed = new NetworkCapabilities.Builder( final NetworkCapabilities.Builder builder =
jobStatus.getJob().getRequiredNetwork().networkCapabilities) copyCapabilities(jobStatus.getJob().getRequiredNetwork());
.removeCapability(NET_CAPABILITY_NOT_METERED).build(); builder.removeCapability(NET_CAPABILITY_NOT_METERED);
if (relaxed.satisfiedByNetworkCapabilities(capabilities)) { if (builder.build().satisfiedByNetworkCapabilities(capabilities)) {
// TODO: treat this as "maybe" response; need to check quotas // TODO: treat this as "maybe" response; need to check quotas
return jobStatus.getFractionRunTime() > constants.CONN_PREFETCH_RELAX_FRAC; return jobStatus.getFractionRunTime() > constants.CONN_PREFETCH_RELAX_FRAC;
} else { } else {