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

Merge "Prevent deadlock in AttentionManagerService" into qt-dev

Browse Source 
am: bcfa3c158e

Change-Id: Ia251cc779740edf5998aacec957fe545cc557557
This commit is contained in:
Alex Salo
2019-05-21 17:48:44 -07:00
committed by android-build-merger
parent 0dd46f1e35 bcfa3c158e
commit e19629a039
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/attention/AttentionManagerService.java
View File

@@ -115,6 +115,14 @@ public class AttentionManagerService extends SystemService {
mAttentionHandler = handler; mAttentionHandler = handler;
} }
@Override
public void onBootPhase(int phase) {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
mContext.registerReceiver(new ScreenStateReceiver(),
new IntentFilter(Intent.ACTION_SCREEN_OFF));
}
}
@Override @Override
public void onStart() { public void onStart() {
publishBinderService(Context.ATTENTION_SERVICE, new BinderService()); publishBinderService(Context.ATTENTION_SERVICE, new BinderService());
@@ -135,10 +143,6 @@ public class AttentionManagerService extends SystemService {
private boolean isServiceAvailable() { private boolean isServiceAvailable() {
if (mComponentName == null) { if (mComponentName == null) {
mComponentName = resolveAttentionService(mContext); mComponentName = resolveAttentionService(mContext);
if (mComponentName != null) {
mContext.registerReceiver(new ScreenStateReceiver(),
new IntentFilter(Intent.ACTION_SCREEN_OFF));
}
} }
return mComponentName != null; return mComponentName != null;
} }