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

Commit c41c7b35 authored by Adam He's avatar Adam He Committed by android-build-merger
Browse files

Merge "Fixes crash due to assigning service before linking death recipient." into qt-dev 

am: e3aa7b9a

Change-Id: I2859efc3c0b4a64f182a219f17843878bb3496d2
parents 2061f810 e3aa7b9a

core/java/com/android/internal/infra/AbstractRemoteService.java

+1 −1
Original line number Diff line number Diff line
@@ -449,13 +449,13 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
                return;

            }

            mBinding = false;

            mService = getServiceInterface(service);

            try {

                service.linkToDeath(AbstractRemoteService.this, 0);

            } catch (RemoteException re) {

                handleBinderDied();

                return;

            }

            mService = getServiceInterface(service);

            handleOnConnectedStateChangedInternal(true);

            mServiceDied = false;

        }