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

Commit c3d3577b authored by TYM Tsai's avatar TYM Tsai Committed by Automerger Merge Worker
Browse files

Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874 

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



Change-Id: I4c423ef9035034aa1efc6a2413e3c14b3df7f484
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6d1fbe6 dc9db874

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

+11 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
    private final int mBindingFlags;

    protected I mService;



    private boolean mBound;

    private boolean mConnecting;

    private boolean mDestroyed;

    private boolean mServiceDied;
@@ -255,8 +256,10 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
                .append(String.valueOf(mDestroyed)).println();

        pw.append(prefix).append(tab).append("numUnfinishedRequests=")

                .append(String.valueOf(mUnfinishedRequests.size())).println();

        final boolean bound = handleIsBound();

        pw.append(prefix).append(tab).append("bound=")

                .append(String.valueOf(mBound));

        final boolean bound = handleIsBound();

        pw.append(prefix).append(tab).append("connected=")

                .append(String.valueOf(bound));

        final long idleTimeout = getTimeoutIdleBindMillis();

        if (bound) {
@@ -430,6 +433,8 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
     */

    abstract void handleBindFailure();



    // This is actually checking isConnected. TODO: rename this and other related methods (or just

    // stop using this class..)

    private boolean handleIsBound() {

        return mService != null;

    }
@@ -445,6 +450,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 


        final boolean willBind = mContext.bindServiceAsUser(mIntent, mServiceConnection, flags,

                mHandler, new UserHandle(mUserId));

        mBound = true;



        if (!willBind) {

            Slog.w(mTag, "could not bind to " + mIntent + " using flags " + flags);
@@ -469,7 +475,10 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
            }

        }

        mNextUnbind = 0;

        if (mBound) {

            mContext.unbindService(mServiceConnection);

            mBound = false;

        }

    }



    private class RemoteServiceConnection implements ServiceConnection {