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

Commit 2be46c20 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11456215 from ed98dc37 to 24Q2-release 

Change-Id: I2280e1e40bef2bc33cc1244e3c1b299001bd0ddf
parents 5b1dbb7d ed98dc37

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -508,6 +508,8 @@ java_library { 
    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    // For jarjar repackaging

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}



java_library {

WEAR_OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ rwmyers@google.com 
nalmalki@google.com

shijianli@google.com

latkin@google.com

djsollen@google.com

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+6 −2
Original line number Diff line number Diff line
@@ -3852,7 +3852,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    // the other jobs that will use this network.

                    if (DEBUG) {

                        Slog.d(TAG, "maybeQueueReadyJobsForExecutionLocked: piggybacking "

                                + batchedJobs.size() + " jobs on " + network

                                + (batchedJobs.size() - unbatchedJobCount) + " jobs on " + network

                                + " because of unbatched job");

                    }

                    jobsToRun.addAll(batchedJobs);
@@ -3892,8 +3892,12 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    // Some job is going to use the CPU anyway. Might as well run all the other

                    // CPU-only jobs.

                    if (DEBUG) {

                        final Integer unbatchedJobCountObj = mUnbatchedJobCount.get(null);

                        final int unbatchedJobCount =

                                unbatchedJobCountObj == null ? 0 : unbatchedJobCountObj;

                        Slog.d(TAG, "maybeQueueReadyJobsForExecutionLocked: piggybacking "

                                + batchedNonNetworkedJobs.size() + " non-network jobs");

                                + (batchedNonNetworkedJobs.size() - unbatchedJobCount)

                                + " non-network jobs");

                    }

                    jobsToRun.addAll(batchedNonNetworkedJobs);

                } else if (batchedNonNetworkedJobs.size() >= minReadyCount) {

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED;

import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;

import static android.net.NetworkCapabilities.TRANSPORT_SATELLITE;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
@@ -139,8 +140,9 @@ public final class ConnectivityController extends RestrictingController implemen 
    static final SparseIntArray sNetworkTransportAffinities = new SparseIntArray();

    static {

        sNetworkTransportAffinities.put(TRANSPORT_CELLULAR, TRANSPORT_AFFINITY_AVOID);

        sNetworkTransportAffinities.put(TRANSPORT_WIFI, TRANSPORT_AFFINITY_PREFER);

        sNetworkTransportAffinities.put(TRANSPORT_ETHERNET, TRANSPORT_AFFINITY_PREFER);

        sNetworkTransportAffinities.put(TRANSPORT_SATELLITE, TRANSPORT_AFFINITY_AVOID);

        sNetworkTransportAffinities.put(TRANSPORT_WIFI, TRANSPORT_AFFINITY_PREFER);

    }



    private final CcConfig mCcConfig;

boot/hiddenapi/hiddenapi-unsupported.txt

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ Landroid/hardware/input/IInputManager$Stub;->asInterface(Landroid/os/IBinder;)La 
Landroid/hardware/location/IContextHubService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IContextHubService;

Landroid/hardware/usb/IUsbManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/location/ICountryListener$Stub;-><init>()V

Landroid/location/IGeocodeProvider$Stub;-><init>()V

Landroid/location/IGeocodeProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/IGeocodeProvider;

Landroid/location/ILocationListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/location/ILocationListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;

Landroid/location/ILocationListener$Stub;-><init>()V