Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SystemCaptionsManagerService to re-bind after a force stop

Browse Source 
This change also fixes a bug in AbstractMasterSystemService where
following a "force stop", the per-user service was not updated if PACKAGE_RESTART_POLICY_REFRESH_EAGER was specified. These behavior resulted with getServiceComponentName returning null and the service not being restarted.

Bug: 160735520
Bug: 160693548
Bug: 160644088
Change-Id: I2f66273bd90e9bb220f799d8ab3b024637b33c24
Merged-In: I2f66273bd90e9bb220f799d8ab3b024637b33c24
Test: Manually
(cherry picked from commit 762e0f9a2e)
This commit is contained in:
Nadav Bar
2020-08-06 12:25:19 +03:00
committed by Gustav Sennton
parent 0ac2f4e4f7
commit 69eb7b7435
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/infra/AbstractMasterSystemService.java
View File

@@ -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);

3
services/systemcaptions/java/com/android/server/systemcaptions/SystemCaptionsManagerService.java
View File

@@ -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