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

Commit 152623f9 authored by Bookatz's avatar Bookatz
Browse files

Remove refs to BatteryStats in ProcessRecord 

It never uses it, so it shouldn't hold it.

Bug: 111763012
Test: atest FrameworksServicesTests:ActivityStarterTests
Change-Id: I50bfd87417375c533697aa4cb53b7276f0e8195b
parent 2e8c7670

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -10029,7 +10029,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
    final ProcessRecord newProcessRecordLocked(ApplicationInfo info, String customProcess,

            boolean isolated, int isolatedUid) {

        String proc = customProcess != null ? customProcess : info.processName;

        BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics();

        final int userId = UserHandle.getUserId(info.uid);

        int uid = info.uid;

        if (isolated) {
@@ -10068,7 +10067,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            StatsLog.write(StatsLog.ISOLATED_UID_CHANGED, info.uid, uid,

                    StatsLog.ISOLATED_UID_CHANGED__EVENT__CREATED);

        }

        final ProcessRecord r = new ProcessRecord(this, stats, info, proc, uid);

        final ProcessRecord r = new ProcessRecord(this, info, proc, uid);

        if (!mBooted && !mBooting

                && userId == UserHandle.USER_SYSTEM

                && (info.flags & PERSISTENT_MASK) == PERSISTENT_MASK) {

services/core/java/com/android/server/am/ProcessRecord.java

+2 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ final class ProcessRecord implements WindowProcessListener { 
    private static final String TAG = TAG_WITH_CLASS_NAME ? "ProcessRecord" : TAG_AM;



    private final ActivityManagerService mService; // where we came from

    private final BatteryStatsImpl mBatteryStats; // where to collect runtime statistics

    final ApplicationInfo info; // all about the first app in the process

    final boolean isolated;     // true if this is a special isolated process

    final int uid;              // uid of process; may be different from 'info' if isolated
@@ -506,10 +505,9 @@ final class ProcessRecord implements WindowProcessListener { 
        }

    }



    ProcessRecord(ActivityManagerService _service, BatteryStatsImpl _batteryStats,

            ApplicationInfo _info, String _processName, int _uid) {

    ProcessRecord(ActivityManagerService _service, ApplicationInfo _info, String _processName,

            int _uid) {

        mService = _service;

        mBatteryStats = _batteryStats;

        info = _info;

        isolated = _info.uid != _uid;

        uid = _uid;

services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+1 −4
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import android.support.test.filters.MediumTest; 
import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import com.android.internal.os.BatteryStatsImpl;

import com.android.server.AppOpsService;



import org.junit.After;
@@ -121,7 +120,6 @@ public class ActivityManagerServiceTest { 
    @Mock private Context mContext;

    @Mock private AppOpsService mAppOpsService;

    @Mock private PackageManager mPackageManager;

    @Mock private BatteryStatsImpl mBatteryStatsImpl;



    private TestInjector mInjector;

    private ActivityManagerService mAms;
@@ -258,8 +256,7 @@ public class ActivityManagerServiceTest { 
        uidRec.hasInternetPermission = true;

        mAms.mActiveUids.put(uid, uidRec);



        final ProcessRecord appRec = new ProcessRecord(mAms, mBatteryStatsImpl,

                new ApplicationInfo(), TAG, uid);

        final ProcessRecord appRec = new ProcessRecord(mAms, new ApplicationInfo(), TAG, uid);

        appRec.thread = Mockito.mock(IApplicationThread.class);

        mAms.mLruProcesses.add(appRec);

services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java

+1 −4
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.times;



import com.android.internal.os.BatteryStatsImpl;

import com.android.server.am.ActivityStarter.Factory;

import com.android.server.am.LaunchParamsController.LaunchParamsModifier;

import com.android.server.am.TaskRecord.TaskRecordFactory;
@@ -202,8 +200,7 @@ public class ActivityStarterTests extends ActivityTestsBase { 


        // If no caller app, return {@code null} {@link ProcessRecord}.

        final ProcessRecord record = containsConditions(preconditions, PRECONDITION_NO_CALLER_APP)

                ? null : new ProcessRecord(service.mAm, mock(BatteryStatsImpl.class),

                mock(ApplicationInfo.class), null, 0);

                ? null : new ProcessRecord(service.mAm, mock(ApplicationInfo.class), null, 0);



        doReturn(record).when(service.mAm).getRecordForAppLocked(anyObject());

services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class AppErrorDialogTest { 
    @UiThreadTest

    public void testCreateWorks() throws Exception {

        AppErrorDialog.Data data = new AppErrorDialog.Data();

        data.proc = new ProcessRecord(null, null, mContext.getApplicationInfo(), "name", 12345);

        data.proc = new ProcessRecord(null, mContext.getApplicationInfo(), "name", 12345);

        data.result = new AppErrorResult();



        AppErrorDialog dialog = new AppErrorDialog(mContext, mService, data);