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

Commit 80132097 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with... 

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
parents 75a24036 489e9c38

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

+3 −3
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import com.android.internal.app.IBatteryStats; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.server.AppStateTracker;

import com.android.server.DeviceIdleInternal;

import com.android.server.FgThread;
@@ -117,6 +116,7 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.Comparator;

import java.util.List;

import java.util.Objects;

import java.util.function.Consumer;

import java.util.function.Predicate;
@@ -1283,7 +1283,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        super(context);



        mLocalPM = LocalServices.getService(PackageManagerInternal.class);

        mActivityManagerInternal = Preconditions.checkNotNull(

        mActivityManagerInternal = Objects.requireNonNull(

                LocalServices.getService(ActivityManagerInternal.class));



        mHandler = new JobHandler(context.getMainLooper());
@@ -1389,7 +1389,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                controller.onSystemServicesReady();

            }



            mAppStateTracker = Preconditions.checkNotNull(

            mAppStateTracker = Objects.requireNonNull(

                    LocalServices.getService(AppStateTracker.class));



            // Register br for package removals and user removals.

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

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.util.Slog; 
import android.util.proto.ProtoOutputStream;



import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.server.AppStateTracker;

import com.android.server.AppStateTracker.Listener;

import com.android.server.LocalServices;
@@ -32,6 +31,7 @@ import com.android.server.job.JobStore; 
import com.android.server.job.StateControllerProto;

import com.android.server.job.StateControllerProto.BackgroundJobsController.TrackedJob;



import java.util.Objects;

import java.util.function.Consumer;

import java.util.function.Predicate;
@@ -59,7 +59,7 @@ public final class BackgroundJobsController extends StateController { 
    public BackgroundJobsController(JobSchedulerService service) {

        super(service);



        mAppStateTracker = Preconditions.checkNotNull(

        mAppStateTracker = Objects.requireNonNull(

                LocalServices.getService(AppStateTracker.class));

        mAppStateTracker.addListener(mForceAppStandbyListener);

    }