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

Commit e3aa7b9a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b08726bb 967cb0ae

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

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

                return;

            }

            }

            mBinding = false;

            mBinding = false;

            mService = getServiceInterface(service);

            try {

            try {

                service.linkToDeath(AbstractRemoteService.this, 0);

                service.linkToDeath(AbstractRemoteService.this, 0);

            } catch (RemoteException re) {

            } catch (RemoteException re) {

                handleBinderDied();

                handleBinderDied();

                return;

                return;

            }

            }

            mService = getServiceInterface(service);

            handleOnConnectedStateChangedInternal(true);

            handleOnConnectedStateChangedInternal(true);

            mServiceDied = false;

            mServiceDied = false;

        }

        }