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

Add null check to destroyUiAutomationService

Browse Source 
Fixes: 129704196
Test: atest UiAutomationManagerTest, atest CtsUiAutomationTestCases
Change-Id: I257c4f7321e9b3b54efe45e46ede50b010494c6e
This commit is contained in:
Phil Weaver
2019-04-02 09:15:14 -07:00
parent 4fb4320a5e
commit c0c7efc442
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);
}
}