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

am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev

Browse Source 
* commit '8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
  BinderDied may be called after we unregistered the death recipient.
This commit is contained in:
Svetoslav
2013-04-16 11:30:18 -07:00
committed by Android Git Automerger
parent b718735aae 8297e68d84
commit a60c8c25fd
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -970,7 +970,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private void addServiceLocked(Service service, UserState userState) {
try {
service.linkToOwnDeath();
service.linkToOwnDeathLocked();
userState.mBoundServices.add(service);
userState.mComponentNameToServiceMap.put(service.mComponentName, service);
} catch (RemoteException re) {
@@ -987,7 +987,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private void removeServiceLocked(Service service, UserState userState) {
userState.mBoundServices.remove(service);
userState.mComponentNameToServiceMap.remove(service.mComponentName);
service.unlinkToOwnDeath();
service.unlinkToOwnDeathLocked();
}
/**
@@ -1765,7 +1765,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
userState.destroyUiAutomationService();
}
removeServiceLocked(this, userState);
dispose();
resetLocked();
return true;
}
@@ -2150,15 +2150,15 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
/* do nothing - #binderDied takes care */
}
public void linkToOwnDeath() throws RemoteException {
public void linkToOwnDeathLocked() throws RemoteException {
mService.linkToDeath(this, 0);
}
public void unlinkToOwnDeath() {
public void unlinkToOwnDeathLocked() {
mService.unlinkToDeath(this, 0);
}
public void dispose() {
public void resetLocked() {
try {
// Clear the proxy in the other process so this
// IAccessibilityServiceConnection can be garbage collected.
@@ -2170,13 +2170,24 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
mServiceInterface = null;
}
public boolean isInitializedLocked() {
return (mService != null);
}
public void binderDied() {
synchronized (mLock) {
// It is possible that this service's package was force stopped during
// whose handling the death recipient is unlinked and still get a call
// on binderDied since the call was made before we unlink but was
// waiting on the lock we held during the force stop handling.
if (!isInitializedLocked()) {
return;
}
mKeyEventDispatcher.flush();
UserState userState = getUserStateLocked(mUserId);
// The death recipient is unregistered in removeServiceLocked
removeServiceLocked(this, userState);
dispose();
resetLocked();
if (mIsAutomation) {
// We no longer have an automation service, so restore
// the state based on values in the settings database.