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

Commit 09414003 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am:... 

Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313" into oc-dev-plus-aosp
parents 1dd67517 b5573283

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6793,6 +6793,7 @@ package android.app.job { 
    field public static final long DEFAULT_INITIAL_BACKOFF_MILLIS = 30000L; // 0x7530L

    field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L

    field public static final int NETWORK_TYPE_ANY = 1; // 0x1

    field public static final int NETWORK_TYPE_METERED = 4; // 0x4

    field public static final int NETWORK_TYPE_NONE = 0; // 0x0

    field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3

    field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7226,6 +7226,7 @@ package android.app.job { 
    field public static final long DEFAULT_INITIAL_BACKOFF_MILLIS = 30000L; // 0x7530L

    field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L

    field public static final int NETWORK_TYPE_ANY = 1; // 0x1

    field public static final int NETWORK_TYPE_METERED = 4; // 0x4

    field public static final int NETWORK_TYPE_NONE = 0; // 0x0

    field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3

    field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6823,6 +6823,7 @@ package android.app.job { 
    field public static final long DEFAULT_INITIAL_BACKOFF_MILLIS = 30000L; // 0x7530L

    field public static final long MAX_BACKOFF_DELAY_MILLIS = 18000000L; // 0x112a880L

    field public static final int NETWORK_TYPE_ANY = 1; // 0x1

    field public static final int NETWORK_TYPE_METERED = 4; // 0x4

    field public static final int NETWORK_TYPE_NONE = 0; // 0x0

    field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3

    field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2

core/java/android/app/job/JobInfo.java

+8 −3
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public class JobInfo implements Parcelable { 
    public static final int NETWORK_TYPE_UNMETERED = 2;

    /** This job requires network connectivity that is not roaming. */

    public static final int NETWORK_TYPE_NOT_ROAMING = 3;

    /** This job requires metered connectivity such as most cellular data networks. */

    public static final int NETWORK_TYPE_METERED = 4;



    /**

     * Amount of backoff a job has initially by default, in milliseconds.
@@ -347,10 +349,13 @@ public class JobInfo implements Parcelable { 
    }



    /**

     * One of {@link android.app.job.JobInfo#NETWORK_TYPE_ANY},

     * The kind of connectivity requirements that the job has.

     *

     * @return One of {@link android.app.job.JobInfo#NETWORK_TYPE_ANY},

     * {@link android.app.job.JobInfo#NETWORK_TYPE_NONE},

     * {@link android.app.job.JobInfo#NETWORK_TYPE_UNMETERED}, or

     * {@link android.app.job.JobInfo#NETWORK_TYPE_NOT_ROAMING}.

     * {@link android.app.job.JobInfo#NETWORK_TYPE_UNMETERED},

     * {@link android.app.job.JobInfo#NETWORK_TYPE_METERED}, or

     * {@link android.app.job.JobInfo#NETWORK_TYPE_NOT_ROAMING},

     */

    public int getNetworkType() {

        return networkType;

services/core/java/com/android/server/job/JobSchedulerService.java

+1 −2
Original line number Diff line number Diff line
@@ -1271,8 +1271,7 @@ public final class JobSchedulerService extends com.android.server.SystemService 
                    if (job.hasIdleConstraint()) {

                        idleCount++;

                    }

                    if (job.hasConnectivityConstraint() || job.hasUnmeteredConstraint()

                            || job.hasNotRoamingConstraint()) {

                    if (job.hasConnectivityConstraint()) {

                        connectivityCount++;

                    }

                    if (job.hasChargingConstraint()) {