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

Merge "oomAdjuster: Change default demotion of renderthreads to default graphics priority" into qt-r1-dev

Browse Source 
am: 1ea0c70db1

Change-Id: I31a66ba8c6b72448a128993fe966fc715de016f5
This commit is contained in:
Thierry Strudel
2019-07-27 00:18:07 -07:00
committed by android-build-merger
parent 9308cb43d1 1ea0c70db1
commit 3d624e4ed4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import static android.os.Process.THREAD_GROUP_BG_NONINTERACTIVE;
import static android.os.Process.THREAD_GROUP_DEFAULT; import static android.os.Process.THREAD_GROUP_DEFAULT;
import static android.os.Process.THREAD_GROUP_RESTRICTED; import static android.os.Process.THREAD_GROUP_RESTRICTED;
import static android.os.Process.THREAD_GROUP_TOP_APP; import static android.os.Process.THREAD_GROUP_TOP_APP;
import static android.os.Process.THREAD_PRIORITY_DISPLAY;
import static android.os.Process.setProcessGroup; import static android.os.Process.setProcessGroup;
import static android.os.Process.setThreadPriority; import static android.os.Process.setThreadPriority;
import static android.os.Process.setThreadScheduler; import static android.os.Process.setThreadScheduler;
@@ -1803,7 +1804,6 @@ public final class OomAdjuster {
if (app.renderThreadTid != 0) { if (app.renderThreadTid != 0) {
setThreadScheduler(app.renderThreadTid, setThreadScheduler(app.renderThreadTid,
SCHED_OTHER, 0); SCHED_OTHER, 0);
setThreadPriority(app.renderThreadTid, -4);
} }
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
Slog.w(TAG, Slog.w(TAG,
@@ -1815,9 +1815,10 @@ public final class OomAdjuster {
} else { } else {
// Reset priority for top app UI and render threads // Reset priority for top app UI and render threads
setThreadPriority(app.pid, 0); setThreadPriority(app.pid, 0);
if (app.renderThreadTid != 0) { }
setThreadPriority(app.renderThreadTid, 0);
} if (app.renderThreadTid != 0) {
setThreadPriority(app.renderThreadTid, THREAD_PRIORITY_DISPLAY);
} }
} }
} catch (Exception e) { } catch (Exception e) {