diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-01 03:16:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-01 03:16:57 +0000 |
| commit | c83a61de64a6f2fc5b47019cc3e51a334d918c59 (patch) | |
| tree | 06bd31a3330572589c8abf88f0847a144bce89f2 | |
| parent | 481898927f73376d93612a585d4b53614f0f674e (diff) | |
| parent | 0d18955d47a9d3f56090e393af0bcab560517649 (diff) | |
Merge "Remove JobInfo usage of NetworkRequest#networkCaps" am: fdef604e07 am: 0d18955d47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512666
Change-Id: Ib154e508d4d6e3be54df4d598ccb1686e602b023
| -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"); } |