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

Merge "Prevent SystemCaptionsManagerService init from blocking unlockUser" into rvc-dev am: ae34fd76ff am: 32b618a663

Browse Source 
Change-Id: Iee87c2c7755a2584af23f074de0ddcefb4f30a7c
This commit is contained in:
TreeHugger Robot
2020-04-08 23:43:56 +00:00
committed by Automerger Merge Worker
parent 6f31c75271 32b618a663
commit 9fcead137b
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java
View File

@@ -16,6 +16,8 @@
package com.android.server.systemcaptions;
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.annotation.Nullable;
import android.content.ComponentName;
import android.content.Context;
@@ -37,6 +39,8 @@ final class RemoteSystemCaptionsManagerService {
private static final String SERVICE_INTERFACE =
"android.service.systemcaptions.SystemCaptionsManagerService";
private static final int MSG_BIND = 1;
private final Object mLock = new Object();
private final Context mContext;
@@ -71,18 +75,26 @@ final class RemoteSystemCaptionsManagerService {
if (mVerbose) {
Slog.v(TAG, "initialize()");
}
ensureBound();
scheduleBind();
}
void destroy() {
/**
* Destroys this service.
*/
public void destroy() {
mHandler.sendMessage(
obtainMessage(RemoteSystemCaptionsManagerService::handleDestroy, this));
}
void handleDestroy() {
if (mVerbose) {
Slog.v(TAG, "destroy()");
Slog.v(TAG, "handleDestroy()");
}
synchronized (mLock) {
if (mDestroyed) {
if (mVerbose) {
Slog.v(TAG, "destroy(): Already destroyed");
Slog.v(TAG, "handleDestroy(): Already destroyed");
}
return;
}
@@ -97,14 +109,24 @@ final class RemoteSystemCaptionsManagerService {
}
}
private void ensureBound() {
private void scheduleBind() {
if (mHandler.hasMessages(MSG_BIND)) {
if (mVerbose) Slog.v(TAG, "scheduleBind(): already scheduled");
return;
}
mHandler.sendMessage(
obtainMessage(RemoteSystemCaptionsManagerService::handleEnsureBound, this)
.setWhat(MSG_BIND));
}
private void handleEnsureBound() {
synchronized (mLock) {
if (mService != null || mBinding) {
return;
}
if (mVerbose) {
Slog.v(TAG, "ensureBound(): binding");
Slog.v(TAG, "handleEnsureBound(): binding");
}
mBinding = true;