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

Commit dba722b8 authored by Gustav Sennton's avatar Gustav Sennton Committed by Automerger Merge Worker
Browse files

Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into... 

Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into rvc-qpr-dev am: 2f4d456c

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

Change-Id: I399b0c3961be731947c50d26b9a31c1db6c268cd
parents e6b11206 2f4d456c

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem 
                        if (debug) {

                            Slog.d(mTag, "Eagerly recreating service for user " + userId);

                        }

                        getServiceForUserLocked(userId);

                        updateCachedServiceLocked(userId);

                    }

                }

                onServicePackageRestartedLocked(userId);

services/systemcaptions/java/com/android/server/systemcaptions/SystemCaptionsManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ public final class SystemCaptionsManagerService extends 
                        context,

                        com.android.internal.R.string.config_defaultSystemCaptionsManagerService),

                /*disallowProperty=*/ null,

                /*packageUpdatePolicy=*/ PACKAGE_UPDATE_POLICY_REFRESH_EAGER);

                /*packageUpdatePolicy=*/ PACKAGE_UPDATE_POLICY_REFRESH_EAGER

                    | PACKAGE_RESTART_POLICY_REFRESH_EAGER);

    }



    @Override