diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-11-30 11:35:13 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2020-12-01 01:37:51 +0000 |
| commit | e8e9dec3951e3e9e34e8546228d8bf3645fe686d (patch) | |
| tree | d2c4deb215f3edb13046401f53ffc4b1d3f1334d /apex/jobscheduler | |
| parent | 540826860636597c634fc8c991d22b97d893bdbc (diff) | |
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
Merged-In: I47e7ab1b887b2fe2dddef223bd7c66bdd290fc56
Change-Id: I47e7ab1b887b2fe2dddef223bd7c66bdd290fc56
Diffstat (limited to 'apex/jobscheduler')
| -rw-r--r-- | apex/jobscheduler/framework/java/android/app/job/JobInfo.java | 8 |
1 files 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 c2d530d00058..24b8055b9a57 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; @@ -1513,7 +1513,7 @@ public class JobInfo implements Parcelable { } // We can't serialize network specifiers if (mIsPersisted && mNetworkRequest != null - && mNetworkRequest.networkCapabilities.getNetworkSpecifier() != null) { + && mNetworkRequest.getNetworkSpecifier() != null) { throw new IllegalArgumentException( "Network specifiers aren't supported for persistent jobs"); } |