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

Commit 9c5ac7bf authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Rom Lemarchand
Browse files

resolve merge conflicts of 152d353e to master.

Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff
parents 0fe13b1f 152d353e
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -18894,8 +18894,6 @@ public final class ActivityManagerService extends ActivityManagerNative
                        }
                    }
                }
                Process.setSwappiness(app.pid,
                        app.curSchedGroup <= Process.THREAD_GROUP_BG_NONINTERACTIVE);
            }
        }
        if (app.repForegroundActivities != app.foregroundActivities) {