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

Merge "Don't call onNullBinding when the service host is dead" into sc-dev

Browse Source
This commit is contained in:
Jing Ji
2021-05-28 01:35:24 +00:00
committed by Android (Google) Code Review
parent 10102d8e25 980dc5ae12
commit e6436d95f8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/LoadedApk.java
View File

@@ -2060,13 +2060,14 @@ public final class LoadedApk {
} }
if (dead) { if (dead) {
mConnection.onBindingDied(name); mConnection.onBindingDied(name);
}
// If there is a new viable service, it is now connected.
if (service != null) {
mConnection.onServiceConnected(name, service);
} else { } else {
// The binding machinery worked, but the remote returned null from onBind(). // If there is a new viable service, it is now connected.
mConnection.onNullBinding(name); if (service != null) {
mConnection.onServiceConnected(name, service);
} else {
// The binding machinery worked, but the remote returned null from onBind().
mConnection.onNullBinding(name);
}
} }
} }