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

Merge changes Iaceb2b7c,I27aa4860,Ic650456a into sc-dev

Browse Source 
* changes:
  BackgroundDexOptService: defer post-boot job further
  ActivityManagerService: don't compact system at BOOT_COMPLETED
  CachedAppOptimizer: don't take AM lock when freezer is not enabled
This commit is contained in:
Tim Murray
2021-02-01 18:21:05 +00:00
committed by Android (Google) Code Review
parent 0ac1939cd6 0977880865
commit df70c69e18
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4509,7 +4509,6 @@ public class ActivityManagerService extends IActivityManager.Stub
String data, Bundle extras, boolean ordered, String data, Bundle extras, boolean ordered,
boolean sticky, int sendingUser) { boolean sticky, int sendingUser) {
synchronized (ActivityManagerService.this) { synchronized (ActivityManagerService.this) {
mOomAdjuster.mCachedAppOptimizer.compactAllSystem();
mAppProfiler.requestPssAllProcsLocked( mAppProfiler.requestPssAllProcsLocked(
SystemClock.uptimeMillis(), true, false); SystemClock.uptimeMillis(), true, false);
} }

10
services/core/java/com/android/server/am/CachedAppOptimizer.java
View File

@@ -741,10 +741,12 @@ public final class CachedAppOptimizer {
// This will ensure app will be out of the freezer for at least FREEZE_TIMEOUT_MS // This will ensure app will be out of the freezer for at least FREEZE_TIMEOUT_MS
void unfreezeTemporarily(ProcessRecord app) { void unfreezeTemporarily(ProcessRecord app) {
synchronized (mAm) { if (mUseFreezer) {
if (app.frozen) { synchronized (mAm) {
unfreezeAppLocked(app); if (app.frozen) {
freezeAppAsync(app); unfreezeAppLocked(app);
freezeAppAsync(app);
}
} }
} }
} }

4
services/core/java/com/android/server/pm/BackgroundDexOptService.java
View File

@@ -118,8 +118,8 @@ public class BackgroundDexOptService extends JobService {
// Schedule a one-off job which scans installed packages and updates // Schedule a one-off job which scans installed packages and updates
// out-of-date oat files. // out-of-date oat files.
js.schedule(new JobInfo.Builder(JOB_POST_BOOT_UPDATE, sDexoptServiceName) js.schedule(new JobInfo.Builder(JOB_POST_BOOT_UPDATE, sDexoptServiceName)
.setMinimumLatency(TimeUnit.MINUTES.toMillis(1)) .setMinimumLatency(TimeUnit.MINUTES.toMillis(10))
.setOverrideDeadline(TimeUnit.MINUTES.toMillis(1)) .setOverrideDeadline(TimeUnit.MINUTES.toMillis(60))
.build()); .build());
// Schedule a daily job which scans installed packages and compiles // Schedule a daily job which scans installed packages and compiles