Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d18955d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I72591ab22b107bef96e94f8d9edb1ad0693b058a
parents f0f8eba2 fdef604e

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -462,11 +462,11 @@ public class JobInfo implements Parcelable { 
    public @NetworkType int getNetworkType() {

    public @NetworkType int getNetworkType() {

        if (networkRequest == null) {

        if (networkRequest == null) {

            return NETWORK_TYPE_NONE;

            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;

            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;

            return NETWORK_TYPE_NOT_ROAMING;

        } else if (networkRequest.networkCapabilities.hasTransport(TRANSPORT_CELLULAR)) {

        } else if (networkRequest.hasTransport(TRANSPORT_CELLULAR)) {

            return NETWORK_TYPE_CELLULAR;

            return NETWORK_TYPE_CELLULAR;

        } else {

        } else {

            return NETWORK_TYPE_ANY;

            return NETWORK_TYPE_ANY;
@@ -1513,7 +1513,7 @@ public class JobInfo implements Parcelable { 
            }

            }

            // We can't serialize network specifiers

            // We can't serialize network specifiers

            if (mIsPersisted && mNetworkRequest != null

            if (mIsPersisted && mNetworkRequest != null

                    && mNetworkRequest.networkCapabilities.getNetworkSpecifier() != null) {

                    && mNetworkRequest.getNetworkSpecifier() != null) {

                throw new IllegalArgumentException(

                throw new IllegalArgumentException(

                        "Network specifiers aren't supported for persistent jobs");

                        "Network specifiers aren't supported for persistent jobs");

            }

            }