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

Merge "Add null check to destroyUiAutomationService"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-03 02:44:12 +00:00
committed by Android (Google) Code Review
parent 7f05818a66 c0c7efc442
commit d8a197183b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java
View File

@@ -64,9 +64,7 @@ class UiAutomationManager {
public void binderDied() {
mUiAutomationServiceOwner.unlinkToDeath(this, 0);
mUiAutomationServiceOwner = null;
if (mUiAutomationService != null) {
destroyUiAutomationService();
}
destroyUiAutomationService();
}
};
@@ -201,17 +199,20 @@ class UiAutomationManager {
private void destroyUiAutomationService() {
synchronized (mLock) {
mUiAutomationService.mServiceInterface.asBinder().unlinkToDeath(mUiAutomationService,
0);
mUiAutomationService.onRemoved();
mUiAutomationService.resetLocked();
mUiAutomationService = null;
mUiAutomationFlags = 0;
if (mUiAutomationServiceOwner != null) {
mUiAutomationServiceOwner.unlinkToDeath(mUiAutomationServiceOwnerDeathRecipient, 0);
mUiAutomationServiceOwner = null;
if (mUiAutomationService != null) {
mUiAutomationService.mServiceInterface.asBinder().unlinkToDeath(
mUiAutomationService, 0);
mUiAutomationService.onRemoved();
mUiAutomationService.resetLocked();
mUiAutomationService = null;
mUiAutomationFlags = 0;
if (mUiAutomationServiceOwner != null) {
mUiAutomationServiceOwner.unlinkToDeath(
mUiAutomationServiceOwnerDeathRecipient, 0);
mUiAutomationServiceOwner = null;
}
mSystemSupport.onClientChangeLocked(false);
}
mSystemSupport.onClientChangeLocked(false);
}
}