diff options
| author | 2022-10-03 19:39:15 +0000 | |
|---|---|---|
| committer | 2022-10-03 19:39:15 +0000 | |
| commit | 89d3afd5764f0e2bb792539601275ece6c8dcb5d (patch) | |
| tree | 64368a99fd1e5c23b4b42f027eeb6a40b2efb7ab | |
| parent | 677d18848ecbfe6301ab1661de695ac3737fa14d (diff) | |
Clarify network validation code.
Clarify the code around loading and validating network capabilities and
transports.
Bug: 248307450
Test: N/A
Change-Id: I2b1daab240d2f812207d5296418ee66445dca045
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/JobStore.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java index 78ab06c9e332..ff4d26dc807d 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobStore.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobStore.java @@ -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; |