Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea464669 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I4d9c7464005bdad716df41330bc76ecd7528e113
parents c550dd09 e6436d95

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) {