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

Commit 9315cab1 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am:... 

Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am: 7f8e1c17 am: fb3b0e62

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17991381



Change-Id: I8d71c80e4654bbdba22bd708129679de8623a659
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23ffc771 fb3b0e62

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ public class MockingOomAdjusterTests { 
                mock(ActivityManagerService.LocalService.class));

        setFieldValue(ActivityManagerService.class, sService, "mBatteryStatsService",

                mock(BatteryStatsService.class));

        setFieldValue(ActivityManagerService.class, sService, "mInjector",

                new ActivityManagerService.Injector(sContext));

        doReturn(mock(AppOpsManager.class)).when(sService).getAppOpsManager();

        doCallRealMethod().when(sService).enqueueOomAdjTargetLocked(any(ProcessRecord.class));

        doCallRealMethod().when(sService).updateOomAdjPendingTargetsLocked(any(String.class));