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

Commit 699111cd authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Create the workchain by default when acquiring the wakelock. 

The APIs to create and use workchains have been available for
a while. So, it should be safe to create a workchain by default.

Since the System acquires the wakelock on behalf of the apps
when scheduling jobs, the worksource should include the System uid
to correctly indicate the wakelock acquirer and will allow us to
differentiate between system-held and app-held wakelocks.

Bug: 352676818
Test: atest services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java
Test: statsd_testdrive 10
Flag: com.android.server.job.create_work_chain_by_default
Change-Id: Ib135729df1a1bcaace2d01ce1a94ec16094b264a
parent cd0e636d

apex/jobscheduler/service/aconfig/job.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -48,3 +48,13 @@ flag { 
       purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "create_work_chain_by_default"

   namespace: "backstage_power"

   description: "Create a workchain by default when acquiring a wakelock"

   bug: "352676818"

   metadata {

       purpose: PURPOSE_BUGFIX

   }

}

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

+3 −2
Original line number Diff line number Diff line
@@ -1617,10 +1617,11 @@ public class JobSchedulerService extends com.android.server.SystemService 


    @NonNull

    public WorkSource deriveWorkSource(int sourceUid, @Nullable String sourcePackageName) {

        if (WorkSource.isChainedBatteryAttributionEnabled(getContext())) {

        if (Flags.createWorkChainByDefault()

                || WorkSource.isChainedBatteryAttributionEnabled(getContext())) {

            WorkSource ws = new WorkSource();

            ws.createWorkChain()

                    .addNode(sourceUid, sourcePackageName)

                    .addNode(sourceUid, null)

                    .addNode(Process.SYSTEM_UID, "JobScheduler");

            return ws;

        } else {

services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java

+34 −0
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ import static com.android.server.job.JobSchedulerService.sElapsedRealtimeClock; 
import static com.android.server.job.JobSchedulerService.sUptimeMillisClock;

import static com.android.server.job.Flags.FLAG_BATCH_ACTIVE_BUCKET_JOBS;

import static com.android.server.job.Flags.FLAG_BATCH_CONNECTIVITY_JOBS_PER_NETWORK;

import static com.android.server.job.Flags.FLAG_CREATE_WORK_CHAIN_BY_DEFAULT;

import static com.android.server.job.Flags.FLAG_THERMAL_RESTRICTIONS_TO_FGS_JOBS;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotEquals;
@@ -58,7 +60,9 @@ import android.app.job.JobScheduler; 
import android.app.job.JobWorkItem;

import android.app.usage.UsageStatsManagerInternal;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.IContentProvider;

import android.content.Intent;

import android.content.PermissionChecker;

import android.content.pm.PackageManager;
@@ -72,10 +76,14 @@ import android.os.BatteryManager; 
import android.os.BatteryManagerInternal;

import android.os.BatteryManagerInternal.ChargingPolicyChangeListener;

import android.os.Looper;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.WorkSource;

import android.os.WorkSource.WorkChain;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.flag.junit.SetFlagsRule;
@@ -2496,6 +2504,32 @@ public class JobSchedulerServiceTest { 
        }

    }



    @RequiresFlagsEnabled(FLAG_CREATE_WORK_CHAIN_BY_DEFAULT)

    @Test

    public void testDeriveWorkSource_flagCreateWorkChainByDefaultEnabled() {

        final WorkSource workSource = mService.deriveWorkSource(TEST_UID, "com.test.pkg");

        assertEquals(TEST_UID, workSource.getAttributionUid());



        assertEquals(1, workSource.getWorkChains().size());

        final WorkChain workChain = workSource.getWorkChains().get(0);

        final int[] expectedUids = {TEST_UID, Process.SYSTEM_UID};

        assertArrayEquals(expectedUids, workChain.getUids());

    }



    @RequiresFlagsDisabled(FLAG_CREATE_WORK_CHAIN_BY_DEFAULT)

    @Test

    public void testDeriveWorkSource_flagCreateWorkChainByDefaultDisabled() {

        final ContentResolver contentResolver = mock(ContentResolver.class);

        doReturn(contentResolver).when(mContext).getContentResolver();

        final IContentProvider iContentProvider = mock(IContentProvider.class);

        doReturn(iContentProvider).when(contentResolver).acquireProvider(anyString());



        final WorkSource workSource = mService.deriveWorkSource(TEST_UID, "com.test.pkg");

        assertEquals(TEST_UID, workSource.getAttributionUid());



        assertNull(workSource.getWorkChains());

    }



    private void setBatteryLevel(int level) {

        doReturn(level).when(mBatteryManagerInternal).getBatteryLevel();

        mService.mBatteryStateTracker