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

Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9

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

Change-Id: Ie87188285f12c8d533ce053c1626a8080e04b67c
This commit is contained in:
Hui Yu
2022-03-24 16:46:13 +00:00
committed by Automerger Merge Worker
parent d336d881bb c9c23976a9
commit a0be2d5cc5
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityManagerInternal.java
View File

@@ -586,8 +586,9 @@ public abstract class ActivityManagerInternal {
/** /**
* Delete uid from the ActivityManagerService PendingStartActivityUids list. * Delete uid from the ActivityManagerService PendingStartActivityUids list.
* @param uid uid * @param uid uid
* @param nowElapsed starting time of updateOomAdj
*/ */
public abstract void deletePendingTopUid(int uid); public abstract void deletePendingTopUid(int uid, long nowElapsed);
/** /**
* Is the uid in ActivityManagerService PendingStartActivityUids list? * Is the uid in ActivityManagerService PendingStartActivityUids list?

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -16318,8 +16318,8 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
@Override @Override
public void deletePendingTopUid(int uid) { public void deletePendingTopUid(int uid, long nowElapsed) {
mPendingStartActivityUids.delete(uid); mPendingStartActivityUids.delete(uid, nowElapsed);
} }
@Override @Override

2
services/core/java/com/android/server/am/OomAdjuster.java
View File

@@ -1378,7 +1378,7 @@ public class OomAdjuster {
mService.mServices.foregroundServiceProcStateChangedLocked(uidRec); mService.mServices.foregroundServiceProcStateChangedLocked(uidRec);
} }
} }
mService.mInternal.deletePendingTopUid(uidRec.getUid()); mService.mInternal.deletePendingTopUid(uidRec.getUid(), nowElapsed);
} }
if (mLocalPowerManager != null) { if (mLocalPowerManager != null) {
mLocalPowerManager.finishUidChanges(); mLocalPowerManager.finishUidChanges();

10
services/core/java/com/android/server/am/PendingStartActivityUids.java
View File

@@ -50,9 +50,15 @@ final class PendingStartActivityUids {
} }
} }
synchronized void delete(int uid) { synchronized void delete(int uid, long nowElapsed) {
final Pair<Integer, Long> pendingPid = mPendingUids.get(uid); final Pair<Integer, Long> pendingPid = mPendingUids.get(uid);
if (pendingPid != null) { if (pendingPid != null) {
if (nowElapsed < pendingPid.second) {
Slog.i(TAG,
"updateOomAdj start time is before than pendingPid added,"
+ " don't delete it");
return;
}
final long delay = SystemClock.elapsedRealtime() - pendingPid.second; final long delay = SystemClock.elapsedRealtime() - pendingPid.second;
if (delay >= 1000 /*ms*/) { if (delay >= 1000 /*ms*/) {
Slog.i(TAG, Slog.i(TAG,
@@ -75,4 +81,4 @@ final class PendingStartActivityUids {
synchronized boolean isPendingTopUid(int uid) { synchronized boolean isPendingTopUid(int uid) {
return mPendingUids.get(uid) != null; return mPendingUids.get(uid) != null;
} }
} }

2
services/tests/wmtests/src/com/android/server/wm/ActivityTaskSupervisorTests.java
View File

@@ -284,7 +284,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
.setCreateActivity(true).build().getTopMostActivity(); .setCreateActivity(true).build().getTopMostActivity();
activity2.getTask().setResumedActivity(activity2, "test"); activity2.getTask().setResumedActivity(activity2, "test");
mAtm.mAmInternal.deletePendingTopUid(activity1.getUid()); mAtm.mAmInternal.deletePendingTopUid(activity1.getUid(), Long.MAX_VALUE);
clearInvocations(mAtm); clearInvocations(mAtm);
activity1.moveFocusableActivityToTop("test"); activity1.moveFocusableActivityToTop("test");
assertTrue(mAtm.mAmInternal.isPendingTopUid(activity1.getUid())); assertTrue(mAtm.mAmInternal.isPendingTopUid(activity1.getUid()));