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

Merge "Emit TRIM_MEMORY_UI_HIDDEN event on switching to background" into sc-v2-dev am: b5d43be702

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

Change-Id: Iee990eac396da90769c51388d1837da735358e46
This commit is contained in:
Jing Ji
2021-09-22 23:31:58 +00:00
committed by Automerger Merge Worker
parent ba74f17220 b5d43be702
commit a383787248
1 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
services/core/java/com/android/server/am/AppProfiler.java
View File

@@ -1033,6 +1033,7 @@ public class AppProfiler {
mService.setProcessTrackerStateLOSP(app, trackerMemFactor, now); mService.setProcessTrackerStateLOSP(app, trackerMemFactor, now);
state.setProcStateChanged(false); state.setProcStateChanged(false);
} }
trimMemoryUiHiddenIfNecessaryLSP(app);
if (curProcState >= ActivityManager.PROCESS_STATE_HOME && !app.isKilledByAm()) { if (curProcState >= ActivityManager.PROCESS_STATE_HOME && !app.isKilledByAm()) {
if (trimMemoryLevel < curLevel[0] && (thread = app.getThread()) != null) { if (trimMemoryLevel < curLevel[0] && (thread = app.getThread()) != null) {
try { try {
@@ -1075,24 +1076,6 @@ public class AppProfiler {
} }
profile.setTrimMemoryLevel(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND); profile.setTrimMemoryLevel(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND);
} else { } else {
if ((curProcState >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND
|| state.isSystemNoUi()) && profile.hasPendingUiClean()) {
// If this application is now in the background and it
// had done UI, then give it the special trim level to
// have it free UI resources.
final int level = ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN;
if (trimMemoryLevel < level && (thread = app.getThread()) != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ, "Trimming memory of bg-ui "
+ app.processName + " to " + level);
}
thread.scheduleTrimMemory(level);
} catch (RemoteException e) {
}
}
profile.setPendingUiClean(false);
}
if (trimMemoryLevel < fgTrimLevel && (thread = app.getThread()) != null) { if (trimMemoryLevel < fgTrimLevel && (thread = app.getThread()) != null) {
try { try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) { if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
@@ -1119,28 +1102,36 @@ public class AppProfiler {
mService.setProcessTrackerStateLOSP(app, trackerMemFactor, now); mService.setProcessTrackerStateLOSP(app, trackerMemFactor, now);
state.setProcStateChanged(false); state.setProcStateChanged(false);
} }
if ((state.getCurProcState() >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND trimMemoryUiHiddenIfNecessaryLSP(app);
|| state.isSystemNoUi()) && profile.hasPendingUiClean()) {
if (profile.getTrimMemoryLevel() < ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN
&& (thread = app.getThread()) != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ,
"Trimming memory of ui hidden " + app.processName
+ " to " + ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN);
}
thread.scheduleTrimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN);
} catch (RemoteException e) {
}
}
profile.setPendingUiClean(false);
}
profile.setTrimMemoryLevel(0); profile.setTrimMemoryLevel(0);
}); });
} }
return allChanged; return allChanged;
} }
@GuardedBy({"mService", "mProcLock"})
private void trimMemoryUiHiddenIfNecessaryLSP(ProcessRecord app) {
if ((app.mState.getCurProcState() >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND
|| app.mState.isSystemNoUi()) && app.mProfile.hasPendingUiClean()) {
// If this application is now in the background and it
// had done UI, then give it the special trim level to
// have it free UI resources.
final int level = ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN;
IApplicationThread thread;
if (app.mProfile.getTrimMemoryLevel() < level && (thread = app.getThread()) != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ, "Trimming memory of bg-ui "
+ app.processName + " to " + level);
}
thread.scheduleTrimMemory(level);
} catch (RemoteException e) {
}
}
app.mProfile.setPendingUiClean(false);
}
}
@GuardedBy("mProcLock") @GuardedBy("mProcLock")
long getLowRamTimeSinceIdleLPr(long now) { long getLowRamTimeSinceIdleLPr(long now) {
return mLowRamTimeSinceLastIdle + (mLowRamStartTime > 0 ? (now - mLowRamStartTime) : 0); return mLowRamTimeSinceLastIdle + (mLowRamStartTime > 0 ? (now - mLowRamStartTime) : 0);