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

Merge "Move binder death handling logic to ServiceConnector#binderDied()." into tm-dev

Browse Source
This commit is contained in:
Raphael Kim
2022-05-27 21:17:31 +00:00
committed by Android (Google) Code Review
parent 81ac10a9de bd3f5caf5d
commit 0bdc2763a9
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java
View File

@@ -119,13 +119,23 @@ class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDe
} }
} }
// This method is only called when app is force-closed via settings,
// but does not handle crashes. Binder death should be handled in #binderDied()
@Override @Override
public void onBindingDied(@NonNull ComponentName name) { public void onBindingDied(@NonNull ComponentName name) {
// IMPORTANT: call super! // IMPORTANT: call super! this will also invoke binderDied()
super.onBindingDied(name); super.onBindingDied(name);
if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString()); if (DEBUG) Log.d(TAG, "onBindingDied() " + mComponentName.toShortString());
}
@Override
public void binderDied() {
super.binderDied();
if (DEBUG) Log.d(TAG, "binderDied() " + mComponentName.toShortString());
// Handle primary process being killed
if (mListener != null) { if (mListener != null) {
mListener.onBindingDied(mUserId, mComponentName.getPackageName()); mListener.onBindingDied(mUserId, mComponentName.getPackageName());
} }