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

Merge "Clarify network validation code."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-03 22:42:28 +00:00
committed by Android (Google) Code Review
parent 94d00b167c 89d3afd576
commit 202617a47c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/jobscheduler/service/java/com/android/server/job/JobStore.java
View File

@@ -1095,6 +1095,8 @@ public final class JobStore {
}
if ((netCapabilitiesIntArray != null) && (netTransportTypesIntArray != null)) {
// S+ format. No capability or transport validation since the values should be in
// line with what's defined in the Connectivity mainline module.
final NetworkRequest.Builder builder = new NetworkRequest.Builder()
.clearCapabilities();
@@ -1111,6 +1113,7 @@ public final class JobStore {
}
jobBuilder.setRequiredNetwork(builder.build());
} else if (netCapabilitiesLong != null && netTransportTypesLong != null) {
// Format used on R- builds. Drop any unexpected capabilities and transports.
final NetworkRequest.Builder builder = new NetworkRequest.Builder()
.clearCapabilities();
final int maxNetCapabilityInR = NET_CAPABILITY_TEMPORARILY_NOT_METERED;