Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix failure in testUpdateOomAdj_UidIdle_StopService." into tm-dev am: 7f8e1c17d9 am: fb3b0e6239 am: 2b23bc8935

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

Change-Id: I32a54c265342274611587dc606975683576c1ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2022-04-29 19:17:34 +00:00
committed by Automerger Merge Worker
parent cdf4fe5a82 2b23bc8935
commit 5ff095abe2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));