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

Commit 2da542d3 authored Mar 22, 2022 by huang chaopeng

[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started



Analysis:
1.Doing updateOomAdjInnerLSP in backgroud, and it would last for a long
time
2.Now start a new Activity, windowManager save the latest topUid into PendingStartActivityUids
3.updateOomAdj task in step.1 done, and then delete all uids in PendingStartActivityUids
4.The topApp will be rejected by AppOps due to the deleting in step.3

Signed-off-by: huang chaopeng <huangchaopeng@oppo.corp-partner.google.com>
Change-Id: I52c7c2a8d6cb86b27b1f008cb56f670ce7698dc9

parent 372b449b

core/java/android/app/ActivityManagerInternal.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -586,8 +586,9 @@ public abstract class ActivityManagerInternal {
		/**
		* Delete uid from the ActivityManagerService PendingStartActivityUids list.
		* @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?

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -16306,8 +16306,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		@Override
		public void deletePendingTopUid(int uid) {
		mPendingStartActivityUids.delete(uid);
		public void deletePendingTopUid(int uid, long nowElapsed) {
		mPendingStartActivityUids.delete(uid, nowElapsed);
		}

		@Override

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

+1 −1

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

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -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);
		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;
		if (delay >= 1000 /ms/) {
		Slog.i(TAG,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
		.setCreateActivity(true).build().getTopMostActivity();
		activity2.getTask().setResumedActivity(activity2, "test");

		mAtm.mAmInternal.deletePendingTopUid(activity1.getUid());
		mAtm.mAmInternal.deletePendingTopUid(activity1.getUid(), Long.MAX_VALUE);
		clearInvocations(mAtm);
		activity1.moveFocusableActivityToTop("test");
		assertTrue(mAtm.mAmInternal.isPendingTopUid(activity1.getUid()));