From cf9139dfbeb73693527cc64414a3b2e16a9be5ca Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Tue, 28 Mar 2023 13:31:46 -0700 Subject: [PATCH] Always persist the last app state changer. Bug: 273282505 Test: manual Change-Id: I3d1ce0924b9aa4e621829b14af879eb3f59d84d4 --- services/core/java/com/android/server/pm/Settings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 02d13bcbb8ae1..417ba0729066a 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -2217,10 +2217,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile } if (ustate.getEnabledState() != COMPONENT_ENABLED_STATE_DEFAULT) { serializer.attributeInt(null, ATTR_ENABLED, ustate.getEnabledState()); - if (ustate.getLastDisableAppCaller() != null) { - serializer.attribute(null, ATTR_ENABLED_CALLER, - ustate.getLastDisableAppCaller()); - } + } + if (ustate.getLastDisableAppCaller() != null) { + serializer.attribute(null, ATTR_ENABLED_CALLER, + ustate.getLastDisableAppCaller()); } if (ustate.getInstallReason() != PackageManager.INSTALL_REASON_UNKNOWN) { serializer.attributeInt(null, ATTR_INSTALL_REASON,