From d2ef0904194f8d3c10923b7e0c03dc0f32dcafe4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 30 Nov 2020 11:35:13 +0900 Subject: Remove JobInfo usage of NetworkRequest#networkCaps NetworkRequest#networkCapabilities is an implementation detail (not part of the NetworkRequest API); NetworkRequest has getters that return the same information. Bug: 174436414 Bug: 142281756 Test: m Change-Id: I47e7ab1b887b2fe2dddef223bd7c66bdd290fc56 --- apex/jobscheduler/framework/java/android/app/job/JobInfo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java index 2c8a5589ca51..3597c27224bb 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobInfo.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobInfo.java @@ -462,11 +462,11 @@ public class JobInfo implements Parcelable { public @NetworkType int getNetworkType() { if (networkRequest == null) { return NETWORK_TYPE_NONE; - } else if (networkRequest.networkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED)) { + } else if (networkRequest.hasCapability(NET_CAPABILITY_NOT_METERED)) { return NETWORK_TYPE_UNMETERED; - } else if (networkRequest.networkCapabilities.hasCapability(NET_CAPABILITY_NOT_ROAMING)) { + } else if (networkRequest.hasCapability(NET_CAPABILITY_NOT_ROAMING)) { return NETWORK_TYPE_NOT_ROAMING; - } else if (networkRequest.networkCapabilities.hasTransport(TRANSPORT_CELLULAR)) { + } else if (networkRequest.hasTransport(TRANSPORT_CELLULAR)) { return NETWORK_TYPE_CELLULAR; } else { return NETWORK_TYPE_ANY; @@ -1558,7 +1558,7 @@ public class JobInfo implements Parcelable { if (isPersisted) { // We can't serialize network specifiers if (networkRequest != null - && networkRequest.networkCapabilities.getNetworkSpecifier() != null) { + && networkRequest.getNetworkSpecifier() != null) { throw new IllegalArgumentException( "Network specifiers aren't supported for persistent jobs"); } -- cgit v1.2.3-59-g8ed1b