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

Commit 44b7f755 authored by Tim Murray's avatar Tim Murray Committed by android-build-merger
Browse files

Merge changes I15da2563,I7845542d into nyc-mr1-dev am: 7b8b1aab 

am: 619682b9

Change-Id: I98afd5bead70cf25ca43e49c1215ccef1e472a83
parents be4eae9f 619682b9

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ bool CanvasContext::isSwapChainStuffed() { 
    }



    // All signs point to a stuffed swap chain

    ATRACE_NAME("swap chain stuffed");

    return true;

}

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

+5 −3
Original line number Diff line number Diff line
@@ -20235,12 +20235,14 @@ public final class ActivityManagerService extends ActivityManagerNative 
                        if (mUseFifoUiScheduling) {

                            // Reset UI pipeline to SCHED_OTHER

                            Process.setThreadScheduler(app.pid, Process.SCHED_OTHER, 0);

                            Process.setThreadPriority(app.pid, app.savedPriority);

                            if (app.renderThreadTid != 0) {

                                Process.setThreadScheduler(app.renderThreadTid,

                                    Process.SCHED_OTHER, 0);

                            Process.setThreadPriority(app.pid, app.savedPriority);

                                Process.setThreadPriority(app.renderThreadTid, -4);

                            }

                        }

                    }

                } catch (Exception e) {

                    Slog.w(TAG, "Failed setting process group of " + app.pid

                            + " to " + app.curSchedGroup);