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

Commit ddd65e15 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Always persist the last app state changer." into udc-dev am: a691318b am: 790f443d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22319366



Change-Id: Ica7e0822edc90db8cc57b1470528747965313b85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2390841 790f443d

services/core/java/com/android/server/pm/Settings.java

+4 −4
Original line number Diff line number Diff line
@@ -2222,11 +2222,11 @@ 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.getInstallReason() != PackageManager.INSTALL_REASON_UNKNOWN) {

                            serializer.attributeInt(null, ATTR_INSTALL_REASON,

                                    ustate.getInstallReason());