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

Commit 77712629 authored May 02, 2023 by Austin Borger Committed by Automerger Merge Worker May 02, 2023

Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into...

Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into udc-dev am: 34ee2b8e am: 6a67b488

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

Change-Id: Icfd9e59e878a92d57785abe0d4eb07651b7d6c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 7345bc77 6a67b488

core/java/android/app/IUidObserver.aidl

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,8 +58,9 @@ oneway interface IUidObserver {
	* Report a proc oom adj change associated with a uid.		* Report a proc oom adj change associated with a uid.
	*		*
	* @param uid The uid for which the state change is being reported.		* @param uid The uid for which the state change is being reported.
			* @param adj The minimum OOM adj among all processes with this uid.
	*/		*/
	void onUidProcAdjChanged(int uid);		void onUidProcAdjChanged(int uid, int adj);

	// =============== End of transactions used on native side as well ============================		// =============== End of transactions used on native side as well ============================

core/java/android/app/UidObserver.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,7 @@ public class UidObserver extends IUidObserver.Stub {
	}		}

	@Override		@Override
	public void onUidProcAdjChanged(int uid) {		public void onUidProcAdjChanged(int uid, int adj) {
	}		}

	@Override		@Override

native/android/activity_manager.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ struct UidObserver : public BnUidObserver, public virtual IBinder::DeathRecipien
	void onUidIdle(uid_t uid, bool disabled) override;		void onUidIdle(uid_t uid, bool disabled) override;
	void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq,		void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq,
	int32_t capability) override;		int32_t capability) override;
	void onUidProcAdjChanged(uid_t uid) override;		void onUidProcAdjChanged(uid_t uid, int32_t adj) override;

	// IBinder::DeathRecipient implementation		// IBinder::DeathRecipient implementation
	void binderDied(const wp<IBinder>& who) override;		void binderDied(const wp<IBinder>& who) override;
	@@ -121,7 +121,7 @@ void UidObserver::onUidActive(uid_t uid __unused) {}

	void UidObserver::onUidIdle(uid_t uid __unused, bool disabled __unused) {}		void UidObserver::onUidIdle(uid_t uid __unused, bool disabled __unused) {}

	void UidObserver::onUidProcAdjChanged(uid_t uid __unused) {}		void UidObserver::onUidProcAdjChanged(uid_t uid __unused, int32_t adj __unused) {}

	void UidObserver::onUidStateChanged(uid_t uid, int32_t procState,		void UidObserver::onUidStateChanged(uid_t uid, int32_t procState,
	int64_t procStateSeq __unused,		int64_t procStateSeq __unused,

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

+3 −1

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

	final int procState = uidRec != null		final int procState = uidRec != null
	? uidRec.getSetProcState() : PROCESS_STATE_NONEXISTENT;		? uidRec.getSetProcState() : PROCESS_STATE_NONEXISTENT;
			final int procAdj = uidRec != null
			? uidRec.getMinProcAdj() : ProcessList.INVALID_ADJ;
	final long procStateSeq = uidRec != null ? uidRec.curProcStateSeq : 0;		final long procStateSeq = uidRec != null ? uidRec.curProcStateSeq : 0;
	final int capability = uidRec != null ? uidRec.getSetCapability() : 0;		final int capability = uidRec != null ? uidRec.getSetCapability() : 0;
	final boolean ephemeral = uidRec != null ? uidRec.isEphemeral() : isEphemeralLocked(uid);		final boolean ephemeral = uidRec != null ? uidRec.isEphemeral() : isEphemeralLocked(uid);
	@@ -16075,7 +16077,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	}		}
	final int enqueuedChange = mUidObserverController.enqueueUidChange(		final int enqueuedChange = mUidObserverController.enqueueUidChange(
	uidRec == null ? null : uidRec.pendingChange,		uidRec == null ? null : uidRec.pendingChange,
	uid, change, procState, procStateSeq, capability, ephemeral);		uid, change, procState, procAdj, procStateSeq, capability, ephemeral);
	if (uidRec != null) {		if (uidRec != null) {
	uidRec.setLastReportedChange(enqueuedChange);		uidRec.setLastReportedChange(enqueuedChange);
	}		}

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -644,6 +644,11 @@ class ProcessRecord implements WindowProcessListener {
	}		}
	}		}

			@GuardedBy({"mService", "mProcLock"})
			int getSetAdj() {
			return mState.getSetAdj();
			}

	@GuardedBy(anyOf = {"mService", "mProcLock"})		@GuardedBy(anyOf = {"mService", "mProcLock"})
	IApplicationThread getThread() {		IApplicationThread getThread() {
	return mThread;		return mThread;