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

Merge "Remove JobInfo usage of NetworkRequest#networkCaps" am: fdef604e07

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512666

Change-Id: I72591ab22b107bef96e94f8d9edb1ad0693b058a
This commit is contained in:
Treehugger Robot
2020-12-01 02:58:00 +00:00
committed by Automerger Merge Worker
parent f0f8eba258 fdef604e07
commit 0d18955d47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/jobscheduler/framework/java/android/app/job/JobInfo.java
View File

@@ -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");
}