diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-12-18 15:32:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-18 15:32:34 +0000 |
| commit | 4ffb4846817f5abb99ea2a205b5162a6a8f75b32 (patch) | |
| tree | b88ecfbda0106fb12d518bb02fa4ce6957b77fb4 | |
| parent | 8a5866e3b691069a729be63ec7c56c82e2b4d71d (diff) | |
| parent | 4e87969a1c43d5e83db63771acdad95b42272656 (diff) | |
Merge "Only apply flag when it has been changed"
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f1cee0348832..16096069631e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -957,10 +957,12 @@ public class ActivityManagerService extends IActivityManager.Stub new DeviceConfig.OnPropertiesChangedListener() { @Override public void onPropertiesChanged(Properties properties) { - mPssDeferralTime = properties.getLong(ACTIVITY_START_PSS_DEFER_CONFIG, 0); - if (DEBUG_PSS) { - Slog.d(TAG_PSS, "Activity-start PSS delay now " - + mPssDeferralTime + " ms"); + if (properties.getKeyset().contains(ACTIVITY_START_PSS_DEFER_CONFIG)) { + mPssDeferralTime = properties.getLong(ACTIVITY_START_PSS_DEFER_CONFIG, 0); + if (DEBUG_PSS) { + Slog.d(TAG_PSS, "Activity-start PSS delay now " + + mPssDeferralTime + " ms"); + } } } }; |