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

Commit 94cc407d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove NOT_RESTRICTED from basic network requests." into tm-dev am:... 

Merge "Remove NOT_RESTRICTED from basic network requests." into tm-dev am: 5389f565 am: b8441f05

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



Change-Id: I56f4b15fbbbe507396f056f239ac9319fd84e9b9
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c65b9474 b8441f05

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.job; 


import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;

import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
@@ -1332,6 +1333,7 @@ public class JobInfo implements Parcelable { 
                builder.addCapability(NET_CAPABILITY_INTERNET);

                builder.addCapability(NET_CAPABILITY_VALIDATED);

                builder.removeCapability(NET_CAPABILITY_NOT_VPN);

                builder.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);



                if (networkType == NETWORK_TYPE_ANY) {

                    // No other capabilities