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

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

Change-Id: I399b0c3961be731947c50d26b9a31c1db6c268cd
This commit is contained in:
Gustav Sennton
2020-09-17 08:53:13 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 2 deletions

View File

@@ -948,7 +948,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem
if (debug) { if (debug) {
Slog.d(mTag, "Eagerly recreating service for user " + userId); Slog.d(mTag, "Eagerly recreating service for user " + userId);
} }
getServiceForUserLocked(userId); updateCachedServiceLocked(userId);
} }
} }
onServicePackageRestartedLocked(userId); onServicePackageRestartedLocked(userId);

View File

@@ -34,7 +34,8 @@ public final class SystemCaptionsManagerService extends
context, context,
com.android.internal.R.string.config_defaultSystemCaptionsManagerService), com.android.internal.R.string.config_defaultSystemCaptionsManagerService),
/*disallowProperty=*/ null, /*disallowProperty=*/ null,
/*packageUpdatePolicy=*/ PACKAGE_UPDATE_POLICY_REFRESH_EAGER); /*packageUpdatePolicy=*/ PACKAGE_UPDATE_POLICY_REFRESH_EAGER
| PACKAGE_RESTART_POLICY_REFRESH_EAGER);
} }
@Override @Override