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

Commit dd92ada6 authored by Kweku Adams's avatar Kweku Adams
Browse files

Clean up JS code. 

Remove redundant extraction of the uninstalled app's UID.

Also fix some code formatting.

Bug: 141645789
Test: atest CtsJobSchedulerTestCases
Change-Id: Icf5f5ee4ab4ed777d5936b96d0832b700e431302
parent 6e34be2b

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

+29 −26
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ import java.util.function.Predicate; 
 *

 * Note on locking: Any operations that manipulate {@link #mJobs} need to lock on that object.

 * Any function with the suffix 'Locked' also needs to lock on {@link #mJobs}.

 *

 * @hide

 */

public class JobSchedulerService extends com.android.server.SystemService
@@ -744,7 +745,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                                try {

                                    final int userId = UserHandle.getUserId(pkgUid);

                                    IPackageManager pm = AppGlobals.getPackageManager();

                                    final int state = pm.getApplicationEnabledSetting(pkgName, userId);

                                    final int state =

                                            pm.getApplicationEnabledSetting(pkgName, userId);

                                    if (state == COMPONENT_ENABLED_STATE_DISABLED

                                            || state == COMPONENT_ENABLED_STATE_DISABLED_USER) {

                                        if (DEBUG) {
@@ -798,16 +800,15 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    }

                }

            } else if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) {

                int uidRemoved = intent.getIntExtra(Intent.EXTRA_UID, -1);

                if (DEBUG) {

                    Slog.d(TAG, "Removing jobs for uid: " + uidRemoved);

                    Slog.d(TAG, "Removing jobs for " + pkgName + " (uid=" + pkgUid + ")");

                }

                synchronized (mLock) {

                    mUidToPackageCache.remove(uidRemoved);

                    mUidToPackageCache.remove(pkgUid);

                    // There's no guarantee that the process has been stopped by the time we

                    // get here, but since this is generally a user-initiated action, it should

                    // be fine to just put USER instead of UNINSTALL or DISABLED.

                    cancelJobsForPackageAndUidLocked(pkgName, uidRemoved,

                    cancelJobsForPackageAndUidLocked(pkgName, pkgUid,

                            JobParameters.STOP_REASON_USER,

                            JobParameters.INTERNAL_STOP_REASON_UNINSTALL, "app uninstalled");

                    for (int c = 0; c < mControllers.size(); ++c) {
@@ -1601,6 +1602,7 @@ public class JobSchedulerService extends com.android.server.SystemService 


    /**

     * Called when we want to remove a JobStatus object that we've finished executing.

     *

     * @return true if the job was removed.

     */

    private boolean stopTrackingJobLocked(JobStatus jobStatus, JobStatus incomingJob,
@@ -1655,7 +1657,6 @@ public class JobSchedulerService extends com.android.server.SystemService 
     * @param failureToReschedule Provided job status that we will reschedule.

     * @return A newly instantiated JobStatus with the same constraints as the last job except

     * with adjusted timing constraints.

     *

     * @see #maybeQueueReadyJobsForExecutionLocked

     */

    @VisibleForTesting
@@ -2116,6 +2117,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
            newReadyJobs.clear();

        }

    }



    private final ReadyJobQueueFunctor mReadyQueueFunctor = new ReadyJobQueueFunctor();



    /**
@@ -2208,6 +2210,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
            runnableJobs.clear();

        }

    }



    private final MaybeReadyJobQueueFunctor mMaybeQueueFunctor = new MaybeReadyJobQueueFunctor();



    private void maybeQueueReadyJobsForExecutionLocked() {
@@ -2599,7 +2602,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
     * Binder stub trampoline implementation

     */

    final class JobSchedulerStub extends IJobScheduler.Stub {

        /** Cache determination of whether a given app can persist jobs

        /**

         * Cache determination of whether a given app can persist jobs

         * key is uid of the calling app; value is undetermined/true/false

         */

        private final SparseArray<Boolean> mPersistCache = new SparseArray<Boolean>();
@@ -2880,8 +2884,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public List<JobInfo> getStartedJobs() {

            final int uid = Binder.getCallingUid();

            if (uid != Process.SYSTEM_UID) {

                throw new SecurityException(

                    "getStartedJobs() is system internal use only.");

                throw new SecurityException("getStartedJobs() is system internal use only.");

            }



            final ArrayList<JobInfo> runningJobs;
@@ -2909,8 +2912,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public ParceledListSlice<JobSnapshot> getAllJobSnapshots() {

            final int uid = Binder.getCallingUid();

            if (uid != Process.SYSTEM_UID) {

                throw new SecurityException(

                    "getAllJobSnapshots() is system internal use only.");

                throw new SecurityException("getAllJobSnapshots() is system internal use only.");

            }

            synchronized (mLock) {

                final ArrayList<JobSnapshot> snapshots = new ArrayList<>(mJobs.size());
@@ -3514,7 +3516,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                        continue;

                    }



                    job.dump(proto, JobSchedulerServiceDumpProto.RegisteredJob.DUMP, true, nowElapsed);

                    job.dump(proto,

                            JobSchedulerServiceDumpProto.RegisteredJob.DUMP, true, nowElapsed);



                    proto.write(

                            JobSchedulerServiceDumpProto.RegisteredJob.IS_JOB_READY_TO_BE_EXECUTED,