Commit 08e07bf1 authored May 28, 2021 by Jing Ji Committed by Automerger Merge Worker May 28, 2021

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

Merge "Don't call onNullBinding when the service host is dead" into sc-dev am: e6436d95 am: ea464669 am: 6ad507bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14739098

Change-Id: Ia923298c7173150707ee366c2aba83f4fef2c65c

core/java/android/app/LoadedApk.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -2060,7 +2060,7 @@ public final class LoadedApk {
		}
		if (dead) {
		mConnection.onBindingDied(name);
		}
		} else {
		// If there is a new viable service, it is now connected.
		if (service != null) {
		mConnection.onServiceConnected(name, service);
		@@ -2069,6 +2069,7 @@ public final class LoadedApk {
		mConnection.onNullBinding(name);
		}
		}
		}

		public void doDeath(ComponentName name, IBinder service) {
		synchronized (this) {