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

Commit 87196117 authored by Ji-Hwan Lee's avatar Ji-Hwan Lee Committed by Android (Google) Code Review
Browse files

Merge "Set mBound only when bind succeeds" into lmp-preview-dev

parents 55f933f7 e17b2dd7

services/core/java/com/android/server/tv/TvInputManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -301,9 +301,8 @@ public final class TvInputManagerService extends SystemService { 


            Intent i = new Intent(TvInputService.SERVICE_INTERFACE).setComponent(

                    userState.inputMap.get(inputId).getComponent());

            mContext.bindServiceAsUser(i, serviceState.mConnection, Context.BIND_AUTO_CREATE,

                    new UserHandle(userId));

            serviceState.mBound = true;

            serviceState.mBound = mContext.bindServiceAsUser(

                    i, serviceState.mConnection, Context.BIND_AUTO_CREATE, new UserHandle(userId));

        } else if (serviceState.mService != null && isStateEmpty) {

            // This means that the service is already connected but its state indicates that we have

            // nothing to do with it. Then, disconnect the service.